diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index ff0ddb1997964a9716c64e05ba2214cb1921610b..01218cbb3c23f28d4eb35948f7191ed6463490a0 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -1,10 +1,68 @@ -############################################# -# Settings Robolectric test target. # -############################################# LOCAL_PATH := $(call my-dir) + +SETTINGS_AOSP_PATH := packages/apps/Settings + +############################################################# +# Build SettingsTest.apk which includes test-only resources.# +############################################################# +include $(CLEAR_VARS) + +LOCAL_PACKAGE_NAME := SettingsTest +LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_CERTIFICATE := platform +LOCAL_PRIVILEGED_MODULE := true +LOCAL_MODULE_TAGS := optional +LOCAL_USE_AAPT2 := true + +RELATIVE_SETTINGS_AOSP_PATH := ../../../../../$(SETTINGS_AOSP_PATH) + +LOCAL_MANIFEST_FILE := $(RELATIVE_SETTINGS_AOSP_PATH)/AndroidManifest.xml + +LOCAL_SRC_FILES := $(call all-java-files-under, $(RELATIVE_SETTINGS_AOSP_PATH)/src) + +LOCAL_RESOURCE_DIR += \ + $(LOCAL_PATH)/res \ + $(SETTINGS_AOSP_PATH)/res + +LOCAL_STATIC_ANDROID_LIBRARIES := \ + androidx.slice_slice-builders \ + androidx.slice_slice-core \ + androidx.slice_slice-view \ + androidx.core_core \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.preference_preference \ + androidx.recyclerview_recyclerview \ + com.google.android.material_material \ + setupcompat \ + setupdesign + +LOCAL_JAVA_LIBRARIES := \ + telephony-common \ + ims-common + +LOCAL_STATIC_JAVA_LIBRARIES := \ + androidx.lifecycle_lifecycle-runtime \ + androidx.lifecycle_lifecycle-extensions \ + guava \ + jsr305 \ + settings-contextual-card-protos-lite \ + contextualcards \ + settings-logtags \ + zxing-core-1.7 + +include frameworks/base/packages/SettingsLib/common.mk +include frameworks/base/packages/SettingsLib/search/common.mk + +include $(BUILD_PACKAGE) + +############################################################# +# Settings Robolectric test target. # +############################################################# include $(CLEAR_VARS) LOCAL_MODULE := SettingsRoboTests +LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-java-files-under, ../../../../../frameworks/base/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils) @@ -17,10 +75,13 @@ LOCAL_JAVA_LIBRARIES := \ mockito-robolectric-prebuilt \ truth-prebuilt -LOCAL_INSTRUMENTATION_FOR := Settings +LOCAL_INSTRUMENTATION_FOR := SettingsTest LOCAL_MODULE_TAGS := optional +# Generate test_config.properties +include external/robolectric-shadows/gen_test_config.mk + include $(BUILD_STATIC_JAVA_LIBRARY) ############################################################# @@ -37,11 +98,11 @@ LOCAL_JAVA_LIBRARIES := \ mockito-robolectric-prebuilt \ truth-prebuilt -LOCAL_TEST_PACKAGE := Settings +LOCAL_TEST_PACKAGE := SettingsTest LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ frameworks/base/packages/SettingsLib/search/src \ LOCAL_ROBOTEST_TIMEOUT := 36000 -include external/robolectric-shadows/run_robotests.mk \ No newline at end of file +include external/robolectric-shadows/run_robotests.mk diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties index aae277902fb9a2c865f4f04076a76cd581814bd0..e40e51ccbec5d6987e0cc730b5db129c60ace08e 100644 --- a/tests/robotests/config/robolectric.properties +++ b/tests/robotests/config/robolectric.properties @@ -1,6 +1,3 @@ -manifest=packages/apps/Settings/AndroidManifest.xml sdk=NEWEST_SDK - shadows=\ - com.android.settings.testutils.shadow.ShadowThreadUtils,\ - com.android.settingslib.testutils.shadow.ShadowXmlUtils + com.android.settings.testutils.shadow.ShadowThreadUtils diff --git a/tests/robotests/res/values-mcc998/config.xml b/tests/robotests/res/values-mcc998/config.xml new file mode 100644 index 0000000000000000000000000000000000000000..f9b91379226044049b1ac10eb046b7682dcbc99d --- /dev/null +++ b/tests/robotests/res/values-mcc998/config.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java index c08b841affee1566f7666c8742d44010a294bd8c..e914b01bea69c21d4f55841842f4a843e321a50d 100644 --- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java @@ -4,20 +4,20 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowPowerManager; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 46a1382a900b25e06eabad8f2c66e7987ad090e8..2d825b3bf0a0e4d1d0d62c0247ae727b6b70855e 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -20,19 +20,19 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowHelpUtils; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowHelpUtils.class) public class HelpTrampolineTest { diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index 28eac07704db29b5db01ed5245b2298296306f9d..78a5ee3ca689c493566aa2672f9e07fe94c0af34 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -19,18 +19,18 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; 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 java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegalSettingsTest { @Before diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 174f5ab7af69ba34e50e9b30537e9edafc18ee76..21cb09cc86adf686efb9b1b1c10d8edb64236543 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -50,7 +50,6 @@ import android.widget.ScrollView; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; @@ -60,11 +59,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class MasterClearTest { diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 6286cb95e284acccd39795318f96a3b8fb673bea..0e4592da1f4172ed02d80019a2eb34f5b1820ff0 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.spy; import android.app.Activity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRecoverySystem; import com.android.settings.testutils.shadow.ShadowWifiP2pManager; @@ -33,9 +32,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowRecoverySystem.class, ShadowWifiP2pManager.class}) public class ResetNetworkConfirmTest { @@ -64,8 +64,7 @@ public class ResetNetworkConfirmTest { Robolectric.getBackgroundThreadScheduler().advanceToLastPostedRunnable(); assertThat(mResetNetworkConfirm.mEraseEsimTask).isNotNull(); - assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()) - .isEqualTo(1); + assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(1); } @Test @@ -75,8 +74,7 @@ public class ResetNetworkConfirmTest { mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */); assertThat(mResetNetworkConfirm.mEraseEsimTask).isNull(); - assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()) - .isEqualTo(0); + assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(0); } /** @@ -84,10 +82,8 @@ public class ResetNetworkConfirmTest { */ @Test public void testResetNetworkData_resetP2p() { - mResetNetworkConfirm.p2pFactoryReset(mActivity); - assertThat(ShadowWifiP2pManager.getFactoryResetCount()) - .isEqualTo(1); + assertThat(ShadowWifiP2pManager.getFactoryResetCount()).isEqualTo(1); } } diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 42fa79f5823594c48d906fcf8bb3d194cf8b4755..9660b9db4cfbb5566fa9be75988b8fcd151220fd 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -29,7 +29,6 @@ import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; @@ -37,17 +36,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowKeyguardManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class, - ShadowKeyguardManager.class, - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowKeyguardManager.class}) public class RestrictedListPreferenceTest { private static final int PROFILE_USER_ID = 11; // From UnlaunchableAppActivity @@ -67,7 +63,9 @@ public class RestrictedListPreferenceTest { Shadows.shadowOf(application.getSystemService(KeyguardManager.class)); mMockHelper = mock(RestrictedPreferenceHelper.class); mShadowUserManager = ShadowUserManager.getShadow(); - mPreference = new RestrictedListPreference(mActivity, mock(AttributeSet.class)); + + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + mPreference = new RestrictedListPreference(mActivity, attributeSet); mPreference.setProfileUserId(PROFILE_USER_ID); ReflectionHelpers.setField(mPreference, "mHelper", mMockHelper); } diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index 761b3f1e6ad6e07934584486be4091f33ec341a3..ec0696b74e01a00fee9738a3e685faca103e16f0 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -24,15 +24,14 @@ import android.app.Activity; import androidx.appcompat.app.AlertDialog; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictedSettingsFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java index aa414649e7072548a7e665162c0d041ddcc50cb1..dd39f12cbba8f9fd2418efb696f2fd9da5a2f439 100644 --- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java @@ -34,19 +34,19 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.core.OnActivityResultListener; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsActivityTest { @Mock @@ -99,7 +99,7 @@ public class SettingsActivityTest { public static class ListenerFragment extends Fragment implements OnActivityResultListener { - public boolean mOnActivityResultCalled; + private boolean mOnActivityResultCalled; @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java index ed0e5a022355d4e2d056c0324d492ade5e0e7d27..2e016384b47d0e460d33f66de6bc83e9beb085cb 100644 --- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java @@ -24,16 +24,15 @@ import android.app.Dialog; import androidx.fragment.app.Fragment; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsDialogFragmentTest { private static final int DIALOG_ID = 15; @@ -72,7 +71,6 @@ public class SettingsDialogFragmentTest { } catch (IllegalStateException e) { // getDialogMetricsCategory called in constructor verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID); - return; } } diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index 6015e2789e8141393f639d01bda1b744b9ae03b9..c2018a94b12e4c45cb0208758ffd6b7b88023747 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -17,8 +17,8 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -32,7 +32,6 @@ import android.content.pm.ResolveInfo; import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.json.JSONException; import org.json.JSONObject; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.io.OutputStream; import java.io.PrintWriter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsDumpServiceTest { private static final String PACKAGE_BROWSER = "com.android.test.browser"; diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java index fe067909ff3ac3df1d174fe7c820360c1b7fd5df..c28ffc4bbb7c12a80728159940a0aace66fdbd08 100644 --- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java +++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java @@ -22,25 +22,24 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ShortcutInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowShortcutManager; +import android.content.pm.ShortcutManager; +import java.util.Collections; 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; -import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowShortcutManager.class}) +@RunWith(RobolectricTestRunner.class) public class SettingsInitializeTest { private Context mContext; private SettingsInitialize mSettingsInitialize; + private ShortcutManager mShortcutManager; @Before public void setUp() { @@ -48,6 +47,7 @@ public class SettingsInitializeTest { mContext = RuntimeEnvironment.application; mSettingsInitialize = new SettingsInitialize(); + mShortcutManager = (ShortcutManager) mContext.getSystemService(Context.SHORTCUT_SERVICE); } @Test @@ -59,14 +59,13 @@ public class SettingsInitializeTest { .setShortLabel("test123") .setIntent(intent) .build(); - final List shortcuts = new ArrayList<>(); - shortcuts.add(info); - ShadowShortcutManager.get().setPinnedShortcuts(shortcuts); + + mShortcutManager.addDynamicShortcuts(Collections.singletonList(info)); + mShortcutManager.requestPinShortcut(info, null); mSettingsInitialize.refreshExistingShortcuts(mContext); - final List updatedShortcuts = - ShadowShortcutManager.get().getLastUpdatedShortcuts(); + final List updatedShortcuts = mShortcutManager.getPinnedShortcuts(); assertThat(updatedShortcuts).hasSize(1); final ShortcutInfo updateInfo = updatedShortcuts.get(0); assertThat(updateInfo.getId()).isEqualTo(id); @@ -87,14 +86,14 @@ public class SettingsInitializeTest { .setIntent(new Intent(Intent.ACTION_DEFAULT)) .build(); info.addFlags(ShortcutInfo.FLAG_IMMUTABLE); - final List shortcuts = new ArrayList<>(); - shortcuts.add(info); - ShadowShortcutManager.get().setPinnedShortcuts(shortcuts); + + mShortcutManager.addDynamicShortcuts(Collections.singletonList(info)); + mShortcutManager.requestPinShortcut(info, null); mSettingsInitialize.refreshExistingShortcuts(mContext); - final List updatedShortcuts = - ShadowShortcutManager.get().getLastUpdatedShortcuts(); - assertThat(updatedShortcuts).isEmpty(); + final List updatedShortcuts = mShortcutManager.getPinnedShortcuts(); + assertThat(updatedShortcuts).hasSize(1); + assertThat(updatedShortcuts.get(0)).isSameAs(info); } } diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 89893173759cde19ed0e4728dd96c8b3cb5a300b..6c573097ff295176e2c3cb37cc764280b12d15e5 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -18,7 +18,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -27,20 +27,19 @@ import android.content.Intent; import android.net.Uri; import android.os.SystemProperties; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import java.io.File; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsLicenseActivityTest { private ActivityController mActivityController; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index 76f70433b480e8239ded2444b2af90437b65c71a..cce01550a7864858f37c5f5b2b322ee1f4279699 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -37,8 +37,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.WorkOnlyCategory; import org.junit.Before; @@ -46,11 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsPreferenceFragmentTest { private static final int ITEM_COUNT = 5; @@ -149,7 +147,6 @@ public class SettingsPreferenceFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void onCreate_hasExtraFragmentKey_shouldExpandPreferences() { doReturn(mContext.getTheme()).when(mActivity).getTheme(); doReturn(mContext.getResources()).when(mFragment).getResources(); @@ -164,7 +161,6 @@ public class SettingsPreferenceFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void onCreate_noPreferenceScreen_shouldNotCrash() { doReturn(mContext.getTheme()).when(mActivity).getTheme(); doReturn(mContext.getResources()).when(mFragment).getResources(); diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index 6220ac18f624b55dfda710e5f54c7af03518e298..513697362f919e89755cfa1a8e2cb78dbd9961c0 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -28,8 +28,9 @@ import com.google.android.setupdesign.util.ThemeHelper; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SetupWizardUtilsTest { @Test diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 3cb9c4c3da0b4c20399a65e8c579659ddb57a509..98163bf9a36535c602d7b8ad983c13bc1ebe6c0f 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -25,17 +25,13 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; - 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(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class SummaryPreferenceTest { private PreferenceViewHolder mHolder; diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java index 269e52de6908925a0cb4335f2f1051cc655e6a4a..e69bd073f52666895e56d0298142fffb1fe17df2 100644 --- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java @@ -27,19 +27,18 @@ import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherSettingsTest { private Context mContext; @@ -61,8 +60,8 @@ public class TetherSettingsTest { setupIsTetherAvailable(true); - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{}); - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); + when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); } @Test @@ -91,7 +90,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() { - when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); @@ -113,7 +112,7 @@ public class TetherSettingsTest { @Test public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() { - when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{}); + when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]); final List niks = TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext); diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 77cbae2b2bc97452e042cfc8c3683b7639518980..c10e0d64df9c03bc3383dc5e82360068f6c3ec03 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -19,8 +19,8 @@ package com.android.settings; 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.Matchers.anyString; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -48,20 +48,19 @@ import android.util.IconDrawableFactory; import android.widget.EditText; 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.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UtilsTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java index 02092670b6cdb2b32cd7f258812466a5db4dfcfb..db14ccacdc3d58371e42cb3ceaf773d928d947d4 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java @@ -38,7 +38,7 @@ import android.content.IntentFilter; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -47,6 +47,7 @@ import com.android.settingslib.bluetooth.HearingAidProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,13 +55,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class}) public class AccessibilityHearingAidPreferenceControllerTest { private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1"; @@ -100,6 +102,11 @@ public class AccessibilityHearingAidPreferenceControllerTest { mHearingAidPreference.setSummary(""); } + @After + public void tearDown() { + ShadowBluetoothUtils.reset(); + } + @Test public void onHearingAidStateChanged_connected_updateHearingAidSummary() { when(mHearingAidProfile.getConnectedDevices()).thenReturn(generateHearingAidDeviceList()); @@ -175,7 +182,7 @@ public class AccessibilityHearingAidPreferenceControllerTest { private void setupBluetoothEnvironment() { ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); mBluetoothManager = new BluetoothManager(mContext); mBluetoothAdapter = mBluetoothManager.getAdapter(); when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); @@ -197,8 +204,7 @@ public class AccessibilityHearingAidPreferenceControllerTest { private void sendIntent(Intent intent) { ArgumentCaptor broadcastReceiverCaptor = ArgumentCaptor.forClass(BroadcastReceiver.class); - verify(mContext).registerReceiver( - broadcastReceiverCaptor.capture(), (IntentFilter) any()); + verify(mContext).registerReceiver(broadcastReceiverCaptor.capture(), any()); BroadcastReceiver br = broadcastReceiverCaptor.getValue(); br.onReceive(mContext, intent); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 00980ade2015098fca04d5a7c4c60bb535c17ad5..96d5bf5ebb74f714b77c8ac04db364d3e376d244 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -29,19 +29,18 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; 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 java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilitySettingsTest { private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen"; private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE = @@ -66,20 +65,19 @@ public class AccessibilitySettingsTest { public void testNonIndexableKeys_existInXmlLayout() { final List niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext); - final List keys = new ArrayList<>(); - - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings)); + final List keys = + XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings); assertThat(keys).containsAllIn(niks); } @Test public void testUpdateVibrationSummary_shouldUpdateSummary() { - final Preference mVibrationPreferenceScreen = new Preference(mContext); - doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference( + final Preference vibrationPreferenceScreen = new Preference(mContext); + doReturn(vibrationPreferenceScreen).when(mSettings).findPreference( VIBRATION_PREFERENCE_SCREEN); - mVibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN); + vibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN); Settings.System.putInt(mContext.getContentResolver(), Settings.System.NOTIFICATION_VIBRATION_INTENSITY, @@ -89,8 +87,8 @@ public class AccessibilitySettingsTest { Settings.System.HAPTIC_FEEDBACK_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF); - mSettings.updateVibrationSummary(mVibrationPreferenceScreen); - assertThat(mVibrationPreferenceScreen.getSummary()).isEqualTo( + mSettings.updateVibrationSummary(vibrationPreferenceScreen); + assertThat(vibrationPreferenceScreen.getSummary()).isEqualTo( VibrationIntensityPreferenceController.getIntensityString(mContext, Vibrator.VIBRATION_INTENSITY_OFF)); } diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index b00d64d8eb5768dcec873fdb3c5fc7d395a71c2b..471f107f533157ce675986e3911809803669a837 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -30,12 +30,12 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import android.view.accessibility.AccessibilityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accessibility.AccessibilityUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowAccessibilityManager; @@ -45,7 +45,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilitySlicePreferenceControllerTest { private final String PACKAGE_NAME = "com.android.settings.fake"; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java index 632eea77aa70849e72352bdc268740437cb5df97..531282b44f3764a998fb0d321592d86be933d6c8 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityTimeoutControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccessibilityTimeoutControllerTest implements AccessibilityTimeoutController.OnChangeListener { private static final String PREF_KEY = "accessibility_content_timeout_30secs"; @@ -91,7 +91,7 @@ public class AccessibilityTimeoutControllerTest mController.updateState(mMockPref); - // the first checked state is seted to false by control + // the first checked state is set to false by control verify(mMockPref).setChecked(false); verify(mMockPref).setChecked(false); } @@ -103,7 +103,7 @@ public class AccessibilityTimeoutControllerTest mController.updateState(mMockPref); - // the first checked state is seted to false by control + // the first checked state is set to false by control verify(mMockPref).setChecked(false); verify(mMockPref).setChecked(true); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java index 2648a50b79ba7d6c0ade13067464fbe2f831b098..6b46652e30f0579dc550c8e525484fb7563e9863 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ColorInversionPreferenceControllerTest { private static final int UNKNOWN = -1; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 96b03236245e452ac177fcd91a35e1a56f92e830..a454831ad254ef701928891129655c8fc696a999 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -23,16 +23,16 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; import com.android.settings.core.BasePreferenceController; -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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HapticFeedbackIntensityPreferenceControllerTest { private LifecycleOwner mLifecycleOwner; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index a143d2577a9542ec9868295d132a62f69988af6d..c6bf343a2c614de5a490373e0d3762248f222175 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -28,15 +28,15 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MagnificationGesturesPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 89a7884a11e2fda8611673ae8fb85f93f956ac31..08b53b20fa55cbeea9d6a09b2947555e95f2eaed 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -31,20 +31,20 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -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.mockito.MockitoAnnotations; +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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MagnificationNavbarPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index 3a7fd56b9c73e827be0bf4dd94d3b271fd073b09..41accfb4d9937cee839dac8f3bf7f4e643a302da 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,9 +41,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 26b3a6c8e2c1781bc9f999b56a65631069d63c7a..3ae0e75d1378684544a23428ce68e09b65b28167 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutServicePickerFragmentTest { private static final String TEST_SERVICE_KEY_1 = "abc/123"; @@ -56,7 +56,7 @@ public class ShortcutServicePickerFragmentTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mFragment = spy(new ShortcutServicePickerFragment()); - mFragment.onAttach((Context) mActivity); + mFragment.onAttach(mActivity); doReturn(RuntimeEnvironment.application).when(mFragment).getContext(); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index bfc176f76824ea72cb5ccaa978d979206719a9ee..c9ca772ce46854a5af49caa7a661b9547acfd618 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -29,17 +29,14 @@ import androidx.annotation.XmlRes; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ToggleFeaturePreferenceFragmentTest { private ToggleFeaturePreferenceFragmentTestable mFragment; diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index a44b62ba0b49f645f08493d9bcbe1cc101a612f6..68d5e362f5e714e8bdf2ea2ca05f8a077de4dba1 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -37,7 +37,6 @@ import com.android.settings.R; import com.android.settings.accessibility.VibrationPreferenceFragment .VibrationIntensityCandidateInfo; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.HashMap; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrationPreferenceFragmentTest { private static final Map INTENSITY_TO_KEY = new HashMap<>(4); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java index 41ac4500b739f201404a005665e572b1f504e2fe..006087516cfda37820c40e88ba0cab98c06fbd92 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -19,17 +19,17 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountDashboardFragmentTest { private AccountDashboardFragment mFragment; @@ -53,6 +53,4 @@ public class AccountDashboardFragmentTest { assertThat(indexRes).isNotNull(); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); } - - } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index f18496c03b5124a7f5a19f14af1c5fddacddb9e4..0be51c31d29eae7309c757ee34317c649a967f2e 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -20,8 +20,8 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITL import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -29,13 +29,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.accounts.Account; -import android.accounts.AccountManager; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -45,7 +43,6 @@ import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.dashboard.DashboardFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.drawer.CategoryKey; @@ -56,13 +53,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowUserManager.class}) public class AccountDetailDashboardFragmentTest { @@ -164,13 +162,11 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountMissing_shouldFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); - accountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); + ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); mFragment.finishIfAccountMissing(); verify(mFragment).finish(); @@ -178,13 +174,11 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountPresentOneProfile_shouldNotFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); - accountManager.addAccountForUser(1, mFragment.mAccount); + ShadowAccountManager.addAccountForUser(1, mFragment.mAccount); mFragment.finishIfAccountMissing(); verify(mFragment, never()).finish(); @@ -192,15 +186,13 @@ public class AccountDetailDashboardFragmentTest { @Test public void onResume_accountPresentTwoProfiles_shouldNotFinish() { - ShadowUserManager userManager = Shadow.extract( - mContext.getSystemService(UserManager.class)); - ShadowAccountManager accountManager = Shadow.extract( - mContext.getSystemService(AccountManager.class)); + ShadowUserManager userManager = + Shadow.extract(mContext.getSystemService(UserManager.class)); userManager.addUserProfile(new UserHandle(1)); userManager.addUserProfile(new UserHandle(2)); - accountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); - accountManager.addAccountForUser(2, mFragment.mAccount); + ShadowAccountManager.addAccountForUser(1, new Account("test@test.com", "com.test")); + ShadowAccountManager.addAccountForUser(2, mFragment.mAccount); mFragment.finishIfAccountMissing(); verify(mFragment, never()).finish(); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index aeb5f547696160efbe12cf3f4e1962efe41735d4..50814ee7c4018b62ca8ab8833497b55183aaed18 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class) public class AccountHeaderPreferenceControllerTest { @@ -113,7 +113,7 @@ public class AccountHeaderPreferenceControllerTest { @Implements(AuthenticatorHelper.class) public static class ShadowAuthenticatorHelper { @Implementation - public void onAccountsUpdated(Account[] accounts) { + protected void onAccountsUpdated(Account[] accounts) { } } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 5ab0982de1c0f94cb7458d45ab646a94c59df754..ed992d2de0df81e5b377f4fcafa28c9cea394eea 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -18,10 +18,10 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; @@ -34,8 +34,6 @@ import android.accounts.AccountManager; import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.UserInfo; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; @@ -49,27 +47,25 @@ import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; 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; +import org.junit.After; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountPreferenceControllerTest { @@ -103,6 +99,11 @@ public class AccountPreferenceControllerTest { mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void onResume_managedProfile_shouldNotAddAccountCategory() { when(mUserManager.isManagedProfile()).thenReturn(true); @@ -216,7 +217,6 @@ public class AccountPreferenceControllerTest { verify(preferenceGroup).setTitle( mContext.getString(R.string.account_for_section_header, "user 1")); - } @Test @@ -338,9 +338,10 @@ public class AccountPreferenceControllerTest { Account[] accounts = {new Account("Account1", "com.acct1")}; when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts); - Account[] accountType1 = new Account[2]; - accountType1[0] = new Account("Account11", "com.acct1"); - accountType1[1] = new Account("Account12", "com.acct1"); + Account[] accountType1 = { + new Account("Account11", "com.acct1"), + new Account("Account12", "com.acct1") + }; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -362,8 +363,7 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class, - ShadowAuthenticatorHelper.class}) + @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_twoAccountsOfSameName_shouldAddFivePreferences() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -532,9 +532,10 @@ public class AccountPreferenceControllerTest { Account[] accounts = {new Account("Acct1", "com.acct1")}; when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts); - Account[] accountType1 = new Account[2]; - accountType1[0] = new Account("Acct11", "com.acct1"); - accountType1[1] = new Account("Acct12", "com.acct1"); + Account[] accountType1 = { + new Account("Acct11", "com.acct1"), + new Account("Acct12", "com.acct1") + }; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -552,8 +553,7 @@ public class AccountPreferenceControllerTest { mController.onResume(); // remove an account - accountType1 = new Account[1]; - accountType1[0] = new Account("Acct11", "com.acct1"); + accountType1 = new Account[] {new Account("Acct11", "com.acct1")}; when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class))) .thenReturn(accountType1); @@ -606,12 +606,4 @@ public class AccountPreferenceControllerTest { private static ArgumentMatcher titleMatches(String expected) { return preference -> TextUtils.equals(expected, preference.getTitle()); } - - @Implements(AuthenticatorHelper.class) - public static class ShadowAuthenticatorHelper { - @Implementation - public Drawable getDrawableForType(Context context, final String accountType) { - return new ColorDrawable(); - } - } } diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java index c699ef8c284f18ed7dc2dfd6f0586ddd9594e2b0..731911450db87d43695e4621e47f8db4bfe8bce7 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java @@ -22,16 +22,16 @@ import static org.mockito.Mockito.verify; import android.accounts.Account; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountPreferenceTest { private AccountPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 0681c82ee71f021c3cb7fcb283ce23022cc4dd7a..1084102c2c443ca429aa9b67ce9d498ca218fef3 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -18,7 +18,7 @@ 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.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.accounts.Account; @@ -34,7 +34,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; @@ -45,10 +44,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountSyncPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java index 7171a6b20b338cf7492aa01ebdf57ea80a9187db..dd1778f95fcee8590c2d6a21bdf048ee93f6b498 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java @@ -25,17 +25,17 @@ import android.os.UserHandle; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowContentResolver; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowContentResolver.class}) public class AccountSyncSettingsTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index c944c30344f0249dffcf620a359742ef05e9d23e..405f6b3dbb82e822518c2da9c7087ae807ef2811 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -17,7 +17,7 @@ package com.android.settings.accounts; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -36,21 +36,22 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -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; +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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AccountTypePreferenceLoaderTest { @Mock(answer = RETURNS_DEEP_STUBS) @@ -81,6 +82,11 @@ public class AccountTypePreferenceLoaderTest { UserHandle.CURRENT)); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void updatePreferenceIntents_shouldRunRecursively() { diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java index f08306dc7d4d6ca3935cd587a8466739d9be1192..7b4fb6f0c6d6bf1963c73a1cccdee76b06c41141 100644 --- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java @@ -19,7 +19,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -41,13 +41,13 @@ import android.widget.ImageView; import com.android.settings.homepage.SettingsHomepageActivity; import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -57,7 +57,7 @@ import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AvatarViewMixinTest { private static final String DUMMY_ACCOUNT = "test@domain.com"; private static final String DUMMY_DOMAIN = "domain.com"; @@ -171,9 +171,8 @@ public class AvatarViewMixinTest { public static class ShadowAccountFeatureProviderImpl { @Implementation - public Account[] getAccounts(Context context) { - Account[] accounts = {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)}; - return accounts; + protected Account[] getAccounts(Context context) { + return new Account[] {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)}; } } } diff --git a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java index 241765e8ecb47e0cd5f69201d3f36fcea3a27b67..49c0fd2c32b2dca3cb80e5f8202bf98de60e989e 100644 --- a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; @@ -49,10 +48,11 @@ 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class, ShadowRestrictedLockUtilsInternal.class}) public class ChooseAccountPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java index 21b93026cb558eb763289984b63ec203bdd4f4bd..c8606e134a56676d3fa130f5f3225ce68e0fb366 100644 --- a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContactSearchPreferenceControllerTest { private static final String PREF_KEY = "contacts_search"; diff --git a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java index 4469282a3669b23eb6f6331e913f40b8caf5cc94..bf4dec6f02f7f1a5c7d1ff95bfbfe25fd48cb21a 100644 --- a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java @@ -32,10 +32,7 @@ import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import android.util.ArraySet; -import android.util.Log; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -43,15 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowDevicePolicyManager; -import java.util.Collections; -import java.util.Set; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CrossProfileCalendarPreferenceControllerTest { private static final String PREF_KEY = "cross_profile_calendar"; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 9e476bd789b504332fe5dd88be9523626c7f3335..5901f55edb075c815464488344e638388df3c9e8 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -37,24 +37,24 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; 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 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.Robolectric; -import org.robolectric.RuntimeEnvironment; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyInfoPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) @@ -76,6 +76,11 @@ public class EmergencyInfoPreferenceControllerTest { when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void updateRawDataToIndex_prefUnavailable_shouldNotUpdate() { final List data = new ArrayList<>(); diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java index 6b806259047ffa3cd54815b84509dec052027bc6..b9c62c2ed7b4a7cd3854addcf38b839f3c4d7b9f 100644 --- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java @@ -27,16 +27,16 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.FooterPreferenceMixinCompat; 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseDisclosurePreferenceControllerTest { private static final String TEST_DISCLOSURE = "This is a test disclosure."; @@ -48,7 +48,6 @@ public class EnterpriseDisclosurePreferenceControllerTest { private PreferenceManager mPreferenceManager; private PreferenceScreen mPreferenceScreen; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index 0803d78d0f25f9258e09323c091577046c760435..6ed266f7604fe310ba6e312c9beebef50bb926de 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -22,15 +22,14 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 83ea218491063b980c231ebc7868de26bb6a9e1d..cf4cb7cf34b084b9a51bd2abf958fd8f07fe67a5 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -18,10 +18,10 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -51,19 +51,20 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; import com.android.settings.testutils.shadow.ShadowContentResolver; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.widget.LayoutPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -72,7 +73,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, ShadowDevicePolicyManager.class @@ -116,6 +117,11 @@ public class RemoveAccountPreferenceControllerTest { mFragment); } + @After + public void tearDown() { + ShadowContentResolver.reset(); + } + @Test public void displayPreference_shouldAddClickListener() { when(mScreen.findPreference(KEY_REMOVE_ACCOUNT)).thenReturn(mPreference); diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java index 86cedb9ed5e3e324169e178ff605245d1671537a..4537eb92452a12912e61ef7e387ce67dc709b994 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java @@ -18,14 +18,13 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.lang.reflect.Modifier; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RemoveUserFragmentTest { @Test diff --git a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java index 0d454181f7e2081e1d9bca35ba6df3ab90cc3c15..9c7b346d36cd9cf644384e6ff38becc631c8f437 100644 --- a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java @@ -22,14 +22,13 @@ import android.accounts.Account; import android.content.Context; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SyncStateSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java index 79e292dcf94d18c241322f44813a2b544e49a4dd..ced3db18ae6bdc0b5c6bb7ea3d065aa7fd6790ca 100644 --- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java @@ -28,20 +28,20 @@ import android.os.UserHandle; import android.text.TextUtils; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.accounts.AuthenticatorHelper; import org.junit.After; 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; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {TopLevelAccountEntryPreferenceControllerTest.ShadowAuthenticationHelper.class}) public class TopLevelAccountEntryPreferenceControllerTest { @@ -91,7 +91,7 @@ public class TopLevelAccountEntryPreferenceControllerTest { static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"}; private static String[] sEnabledAccount = TYPES; - public void __constructor__(Context context, UserHandle userHandle, + protected void __constructor__(Context context, UserHandle userHandle, AuthenticatorHelper.OnAccountsUpdateListener listener) { } @@ -105,12 +105,12 @@ public class TopLevelAccountEntryPreferenceControllerTest { } @Implementation - public String[] getEnabledAccountTypes() { + protected String[] getEnabledAccountTypes() { return sEnabledAccount; } @Implementation - public CharSequence getLabelForType(Context context, final String accountType) { + protected CharSequence getLabelForType(Context context, final String accountType) { if (TextUtils.equals(accountType, TYPES[0])) { return LABELS[0]; } else if (TextUtils.equals(accountType, TYPES[1])) { diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index 1223d5590c0f26af219a0824a639947300326cf4..4871cced349189df071eceb6286ecd175f63fa13 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -30,16 +30,16 @@ import android.os.UserManager; import androidx.preference.SwitchPreference; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkModePreferenceControllerTest { private static final String PREF_KEY = "work_mode"; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 3031f5b1a0f0aeb11608620875d956634198bdac..1f63c9c4e48fbb630511074fa62203d313853fbf 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; @@ -53,11 +52,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index e828a628bb9c5563fff6c358233fb6e2c30f5160..4343e16143e8afbc41b0ee3959796d2b556329a6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -35,19 +35,18 @@ import android.content.pm.PermissionInfo; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 a4eeacd26bc4204c4c7d5c1a97f2fb1738f4e3ce..3f4175e1c22fb2af8efbab69652538adbfb2bd34 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.Manifest; @@ -27,7 +27,6 @@ import android.content.pm.IPackageManager; import android.os.RemoteException; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import org.junit.Before; @@ -35,8 +34,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppStateAppOpsBridgeTest { @Mock private Context mContext; @@ -61,7 +61,7 @@ public final class AppStateAppOpsBridgeTest { } private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge { - public TestAppStateAppOpsBridge() { + private TestAppStateAppOpsBridge() { super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW, new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW}, mPackageManagerService); diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java index fee7a8b65e130f6098af6e29984e4a0dd20feb12..304dfe9735b914a0bb50e057f034bb18b581b08d 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.app.AppOpsManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateInstallAppsBridgeTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java index cb504861a745fbb8181d8377bcc07edf1fc2b2c1..10f3706c7d05ba013a95f66f43c63cd489ab2098 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java @@ -31,9 +31,8 @@ import static com.android.settings.applications.AppStateNotificationBridge import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -59,7 +58,6 @@ import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState; import com.android.settings.notification.NotificationBackend; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; @@ -68,13 +66,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateNotificationBridgeTest { private static String PKG1 = "pkg1"; @@ -151,7 +150,7 @@ public class AppStateNotificationBridgeTest { .thenReturn(usageEvents); Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); } @Test @@ -173,8 +172,8 @@ public class AppStateNotificationBridgeTest { .thenReturn(usageEvents); Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(2); - assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(2); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); } @Test @@ -197,10 +196,10 @@ public class AppStateNotificationBridgeTest { Map map = mBridge.getAggregatedUsageEvents(); - assertThat(map.get(mBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); - assertThat(map.get(mBridge.getKey(0, PKG2)).sentCount).isEqualTo(1); - assertThat(map.get(mBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); - assertThat(map.get(mBridge.getKey(0, PKG2)).lastSent).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).sentCount).isEqualTo(1); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG1)).lastSent).isEqualTo(6); + assertThat(map.get(AppStateNotificationBridge.getKey(0, PKG2)).lastSent).isEqualTo(1); } @Test @@ -419,6 +418,7 @@ public class AppStateNotificationBridgeTest { AppEntry allow = mock(AppEntry.class); allow.extraInfo = allowState; + assertTrue(FILTER_APP_NOTIFICATION_RECENCY.filterApp(allow)); NotificationsSentState denyState = new NotificationsSentState(); @@ -557,7 +557,7 @@ public class AppStateNotificationBridgeTest { @Test public void testSwitchViews_nullDoesNotCrash() { - mBridge.enableSwitch(null); - mBridge.checkSwitch(null); + AppStateNotificationBridge.enableSwitch(null); + AppStateNotificationBridge.checkSwitch(null); } } diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java index 114000ce508f8ab58eb8bbe00cfc913a43a841ad..35177024b38795b22f61c482b0ac1b961db58230 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -31,7 +31,6 @@ import android.content.Context; import android.view.View; import android.widget.Button; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; import com.android.settingslib.widget.ActionButtonsPreference; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 04a1237150ae99087e0125b7a5640c6ad0aff7e8..49d4aac978050f409462abc8e2d6a985bcda2fc6 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -10,16 +10,16 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStorageSizesControllerTest { private static final String COMPUTING = "Computing…"; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 43f855ddf0e3766b8381c7f42215b9896fb8f09c..4e08f9841df5579e434d2968aa56eee96dfbcdae 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -20,9 +20,9 @@ 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.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -39,18 +39,18 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - +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.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsCounterTest { private final String APP_1 = "app1"; @@ -221,7 +221,7 @@ public final class AppWithAdminGrantedPermissionsCounterTest { // granted both permissions by the admin. It should be counted. when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, - MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(mApp6)); + MANAGED_PROFILE_ID)).thenReturn(Collections.singletonList(mApp6)); // app3 and app5 were installed by enterprise policy. final UserHandle mainUser = new UserHandle(MAIN_USER_ID); @@ -239,7 +239,6 @@ public final class AppWithAdminGrantedPermissionsCounterTest { final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID); when(mPackageManager.getInstallReason(APP_6, managedProfileUser)) .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN); - } private void configureUserManager() { diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 96836ae90a2874caa424157a636d80b4464c2e0b..a8186373d3886109c414c235deecca4dcd16c3dc 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -20,9 +20,9 @@ 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.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -36,20 +36,19 @@ import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -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.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppWithAdminGrantedPermissionsListerTest { private final String APP_1 = "app1"; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index 128f34547a493fb0961f2a6180907c17e7a56eb2..9cfdf983c10ec92ae1a32d2259497b98a5da10f3 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -36,7 +36,6 @@ import android.os.UserManager; import com.android.settings.R; import com.android.settings.testutils.ApplicationTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.shadow.ShadowDefaultDialerManager; import com.android.settingslib.testutils.shadow.ShadowSmsApplication; @@ -45,6 +44,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -58,7 +58,7 @@ import java.util.Set; /** * Tests for {@link ApplicationFeatureProviderImpl}. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ApplicationFeatureProviderImplTest { private final int MAIN_USER_ID = 0; @@ -109,8 +109,7 @@ public final class ApplicationFeatureProviderImplTest { .thenReturn(PackageManager.INSTALL_REASON_POLICY); mAppCount = -1; - mProvider.calculateNumberOfPolicyInstalledApps(async, - (num) -> mAppCount = num); + mProvider.calculateNumberOfPolicyInstalledApps(async, (num) -> mAppCount = num); if (async) { ShadowApplication.runBackgroundTasks(); } diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index 8098e5c10a21f2d3ea000750b75b0f351be9dc8a..1ab086ccf8b188ab0932e1968e6ceafbeaf7aa76 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -38,19 +38,19 @@ import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceCon import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController; import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; 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.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppSettingsTest { private Context mContext; @@ -146,7 +146,6 @@ public class DefaultAppSettingsTest { summaryProvider.setListening(true); verify(summaryLoader, never()).setSummary(summaryProvider, eq(anyString())); - } @Test diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java index 9ab1b5edecd123fa42e07d44c7b895476f245063..558334da958cfb755931d52de1f64ed88079a21b 100644 --- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java @@ -16,18 +16,18 @@ package com.android.settings.applications; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertTrue; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseDefaultAppsTest { @Test - public void testNumberOfIntentsCorrelateWithUI() throws Exception { + public void testNumberOfIntentsCorrelateWithUI() { final int concatenation_templates[] = new int[]{0 /* no need for single app name */, R.string.app_names_concatenation_template_2, diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 3378492d27d4315e3c081fe088ba0083e3436c94..144fe18fe250db1e805d3634e61d6a73f0e22b27 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -28,7 +28,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; @@ -40,8 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import java.io.IOException; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FetchPackageStorageAsyncLoaderTest { private static final String PACKAGE_NAME = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index a68a00b6cd041c70ff8f348aba011e4619592501..2c1fab8ad80ffc9917f8ba183d07b85902cce5c2 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -21,9 +21,9 @@ 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -38,14 +38,13 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - 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.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; @@ -53,7 +52,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class InstalledAppCounterTest { private final String APP_1 = "app1"; @@ -232,7 +231,6 @@ public final class InstalledAppCounterTest { .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN); } - private class InstalledAppCounterTestable extends InstalledAppCounter { 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 3cb5a57a70b20eae324bd4b8be8117ad5cbc6ec9..e2aed368f804012978757c7944954d3a50ac336a 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -20,10 +20,10 @@ 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.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,14 +36,13 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - 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.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; @@ -52,7 +51,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class InstalledAppListerTest { private final String APP_1 = "app1"; @@ -189,7 +188,7 @@ public final class InstalledAppListerTest { } private class InstalledAppListerTestable extends InstalledAppLister { - public InstalledAppListerTestable() { + private InstalledAppListerTestable() { super(mPackageManager, mUserManager); } diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 3d3a05a9384423de776526afff1cf77cfa3d31fa..aab2156de084618bc7a9476b038b38c5e3eac446 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -18,11 +18,11 @@ 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; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -50,7 +50,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -62,6 +61,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -69,7 +69,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentAppsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index 694625ef082b3a3697445bfdabd0725312903bc9..e2035e33c421edbf240f06286c3a3a19b132737f 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.datausage.AppStateDataUsageBridge; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowApplicationsState; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.applications.ApplicationsState; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowApplicationsState.class}) public class SpecialAppAccessPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 183468905c5ff29750996a92410bf3db8c2d3235..827abc09afe6358d67336cb486b42c67e6d50249 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -26,16 +26,16 @@ import android.os.Bundle; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsageAccessDetailsTest { private FakeFeatureFactory mFeatureFactory; 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 284ce06c748319fa703671b476c131bee9b5c2d9..154856ebeb98214bd65bfb973b8006793749c956 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -19,7 +19,7 @@ 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.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -41,7 +41,6 @@ import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -49,13 +48,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppBatteryPreferenceControllerTest { private static final int TARGET_UID = 111; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java index f8dd11bb726bf482f4483d4867e69759a3274a14..f3d85d3993a019c212d1d1de44f7ba497bd29e88 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -18,11 +18,11 @@ 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.anyBoolean; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -49,7 +49,6 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -64,9 +63,10 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppButtonsPreferenceControllerTest { private static final String PACKAGE_NAME = "com.android.settings"; @@ -202,7 +202,7 @@ public class AppButtonsPreferenceControllerTest { } @Test - public void isAvailable_nonInstantApp() throws Exception { + public void isAvailable_nonInstantApp() { mController.mAppEntry = mAppEntry; ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @@ -215,7 +215,7 @@ public class AppButtonsPreferenceControllerTest { } @Test - public void isAvailable_instantApp() throws Exception { + public void isAvailable_instantApp() { mController.mAppEntry = mAppEntry; ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider", new InstantAppDataProvider() { @@ -371,7 +371,8 @@ public class AppButtonsPreferenceControllerTest { @Test public void onPackageListChanged_available_shouldRefreshUi() { - doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus(); + doReturn(AppButtonsPreferenceController.AVAILABLE) + .when(mController).getAvailabilityStatus(); doReturn(true).when(mController).refreshUi(); mController.onPackageListChanged(); @@ -381,7 +382,8 @@ public class AppButtonsPreferenceControllerTest { @Test public void onPackageListChanged_notAvailable_shouldNotRefreshUiAndNoCrash() { - doReturn(mController.DISABLED_FOR_USER).when(mController).getAvailabilityStatus(); + doReturn(AppButtonsPreferenceController.DISABLED_FOR_USER) + .when(mController).getAvailabilityStatus(); mController.onPackageListChanged(); 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 fe70c7ec81efe5d35ca1ff6441cd41c3d5f480f9..191db428e7ba4d3c5b3f26677f68ec85386762f2 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.Bundle; 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; import org.junit.Before; @@ -45,12 +44,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.loader.app.LoaderManager; import androidx.preference.Preference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDataUsagePreferenceControllerTest { @Mock 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 67702f1dc42e747b07dfaebac20a7e243ebf2c56..c82cbe52f8793d8b77b337f84201748ef64ac907 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -53,9 +52,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppHeaderViewPreferenceControllerTest { @Mock 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 539e75ff21fedbeaf7fa2e065e6f8f31763c2431..9e44c955ed9f24df462e55f625bcf1ad72503ee1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -48,7 +48,6 @@ import android.view.MenuItem; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -61,6 +60,7 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -68,7 +68,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class AppInfoDashboardFragmentTest { private static final String PACKAGE_NAME = "test_package_name"; @@ -239,7 +239,8 @@ public final class AppInfoDashboardFragmentTest { public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() { doReturn(true).when(mFragment).refreshUi(); - mFragment.onActivityResult(mFragment.REQUEST_UNINSTALL, 0, mock(Intent.class)); + mFragment + .onActivityResult(AppInfoDashboardFragment.REQUEST_UNINSTALL, 0, mock(Intent.class)); verify(mActivity).invalidateOptionsMenu(); } 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 e68f8d39955da29caa69bb6c00c25d3b95daf60d..5e88aafa7f864e28117957dd39d7641d01c94bda 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -36,7 +36,6 @@ import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.notification.AppNotificationSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -45,9 +44,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInfoPreferenceControllerBaseTest { @Mock 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 30152a4077597f51581a106f655178f43f23fa37..1f85477c02ebe9626f0b3f20af37650409e3166c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -40,16 +40,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInstallerInfoPreferenceControllerTest { @Mock 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 8fbc27cf3dfc212341551d7f94073bc359e2450d..b7f84cffa13abb03b9c146cb13f7629da8ead050 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -34,7 +34,6 @@ import com.android.settings.SettingsActivity; 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.Before; @@ -43,11 +42,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class AppMemoryPreferenceControllerTest { 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 a3e7ca6af150df92df60d81836ad798d9829d89e..60352ae545cd2bf3a1a3d8ad3979a5a11208f7ba 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -45,10 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppNotificationPreferenceControllerTest { @Mock @@ -114,7 +114,7 @@ public class AppNotificationPreferenceControllerTest { @Test public void getNotificationSummary_noCrashOnNull() { - mController.getNotificationSummary(null, mContext); + AppNotificationPreferenceController.getNotificationSummary(null, mContext); } @Test @@ -122,8 +122,9 @@ public class AppNotificationPreferenceControllerTest { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.banned = true; appRow.blockedChannelCount = 30; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()) - .isEqualTo("Off"); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo("Off"); } @Test @@ -132,8 +133,9 @@ public class AppNotificationPreferenceControllerTest { appRow.banned = false; appRow.blockedChannelCount = 30; appRow.channelCount = 30; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()) - .isEqualTo("Off"); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo("Off"); } @Test @@ -144,10 +146,13 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 60; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentWeekly = 4; - assertThat(mController.getNotificationSummary( + assertThat(AppNotificationPreferenceController.getNotificationSummary( appRow, mContext).toString().contains("30")).isTrue(); - assertThat(mController.getNotificationSummary(appRow, mContext).toString().contains( - NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false))).isTrue(); + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString() + .contains( + NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false))) + .isTrue(); } @Test @@ -158,7 +163,9 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 10; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentDaily = 4; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo( + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo( NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false)); } @@ -170,7 +177,9 @@ public class AppNotificationPreferenceControllerTest { appRow.channelCount = 0; appRow.sentByApp = new NotificationBackend.NotificationsSentState(); appRow.sentByApp.avgSentDaily = 7; - assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo( + assertThat( + AppNotificationPreferenceController.getNotificationSummary(appRow, mContext).toString()) + .isEqualTo( NotificationBackend.getSentSummary(mContext, appRow.sentByApp, false)); } } 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 b3d0a0dbaf96c93c30a94320bf5b00ccb470e6e3..b6da54e634dc149c95e5af86ae625d80c4215134 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.applications.AppLaunchSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -43,10 +42,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppOpenByDefaultPreferenceControllerTest { @Mock 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 e6ae61888c7aa90638df1c48e7807142a9e69609..022de97cbb0aad19a1e5420145073ab2246984c8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPermissionPreferenceControllerTest { @Mock @@ -77,7 +77,8 @@ public class AppPermissionPreferenceControllerTest { @Test public void getAvailabilityStatus_isAlwaysAvailable() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(AppPermissionPreferenceController.AVAILABLE); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index 9f0fd3182a1b0b4e7d34dfab6b0cdb0499cd9ee6..bda1e612a21a45e47e6b8e3121f7aa0735d26cb6 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -25,19 +25,18 @@ import android.content.pm.ResolveInfo; import androidx.preference.Preference; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppSettingPreferenceControllerTest { private static final String TEST_PKG_NAME = "test_pkg"; 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 0cf8b081a6a61daba8092060e72e0df459d3cac9..809d2cfefd184678a21daed970ae5673ee186439 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.loader.app.LoaderManager; import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.StorageStatsSource; @@ -42,9 +41,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStoragePreferenceControllerTest { @Mock 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 e07f66e976247918cdb39164f866aa7d388ec17b..1f513a36b41a359363dd68e56af5dba4e511f83d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.content.pm.PackageInfo; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java index e9ff8fb5ae8ed472e39a9ff0bb1a1021c921ae2b..d9ed6b08b63ebac8e45e2eb3acf37fd4f84871c4 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java @@ -17,7 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,8 +30,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -39,12 +37,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class ButtonActionDialogFragmentTest { private static final int FORCE_STOP_ID = ButtonActionDialogFragment.DialogType.FORCE_STOP; 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 da1c6b44f6560503401aaaa7b4d3d710cd9ffcb9..dd7cde2a46e9260d9cc70c45d9b69b267b5f9606 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -32,7 +32,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.DefaultAppSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,8 +39,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppShortcutPreferenceControllerBaseTest { @Mock @@ -68,7 +68,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() { when(mUserManager.isManagedProfile()).thenReturn(true); - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(DefaultAppShortcutPreferenceControllerBase.DISABLED_FOR_USER); } @Test @@ -76,7 +77,8 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { mController.capable = true; when(mUserManager.isManagedProfile()).thenReturn(false); - assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE); + assertThat(mController.getAvailabilityStatus()) + .isEqualTo(DefaultAppShortcutPreferenceControllerBase.AVAILABLE); } @Test @@ -85,7 +87,7 @@ public class DefaultAppShortcutPreferenceControllerBaseTest { when(mUserManager.isManagedProfile()).thenReturn(false); assertThat(mController.getAvailabilityStatus()).isEqualTo( - mController.UNSUPPORTED_ON_DEVICE); + DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE); } @Test 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 f4571ce390ec90b71c4d2f15db6e2701de910e04..65b68aaab4498709aa581d01ad8843fe4ae36591 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -18,8 +18,8 @@ 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.argThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -28,19 +28,18 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserShortcutPreferenceControllerTest { @Mock 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 e630a4c5d370caff479f3df381400a6284fd4acd..8f12f98fb731ce8869e61112e55cc9d538c3c4d1 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -29,19 +29,18 @@ import android.content.pm.ResolveInfo; import android.provider.Settings; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultEmergencyShortcutPreferenceControllerTest { @Mock 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 a0b802e80f1252afdacc08dc902d8aa3ef40ca30..ff281b2d1e0f786cc6727e4a560d3c0b2dcffa5f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -27,19 +27,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultHomePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomeShortcutPreferenceControllerTest { @Mock @@ -89,7 +89,7 @@ public class DefaultHomeShortcutPreferenceControllerTest { @Implements(DefaultHomePreferenceController.class) public static class ShadowDefaultHomePreferenceController { @Implementation - public static boolean hasHomePreference(String pkg, Context context) { + protected static boolean hasHomePreference(String pkg, Context context) { 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 ac79a4fba6ab0cb81bd49c5209f99152ea24393b..bdb7ba338cb07ea44beddc92d44888c279366950 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -25,19 +25,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultPhoneShortcutPreferenceControllerTest { @Mock @@ -84,12 +84,12 @@ public class DefaultPhoneShortcutPreferenceControllerTest { @Implements(DefaultPhonePreferenceController.class) public static class ShadowDefaultPhonePreferenceController { @Implementation - public static boolean hasPhonePreference(String pkg, Context context) { + protected static boolean hasPhonePreference(String pkg, Context context) { return true; } @Implementation - public static boolean isPhoneDefault(String pkg, Context context) { + protected static boolean isPhoneDefault(String pkg, Context context) { 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 3b9ce3d450b69c6231befc4d3a208a5ae46a91c2..93582bf87767abd5c473c3b834073640858202b9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -25,19 +25,19 @@ import android.content.Context; import android.content.pm.PackageManager; import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultSmsShortcutPreferenceControllerTest { @Mock @@ -84,12 +84,12 @@ public class DefaultSmsShortcutPreferenceControllerTest { @Implements(DefaultSmsPreferenceController.class) public static class ShadowDefaultSmsPreferenceController { @Implementation - public static boolean hasSmsPreference(String pkg, Context context) { + protected static boolean hasSmsPreference(String pkg, Context context) { return true; } @Implementation - public static boolean isSmsDefault(String pkg, Context context) { + protected static boolean isSmsDefault(String pkg, Context context) { 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 3cc4cfe6caacbef12db054e4114cc33dd842b637..6a4f2e1921d98fa0a64167a885ebc32d9cddab3f 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DrawOverlayDetailPreferenceControllerTest { @Mock 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 4093cba68de0d3a7e87a6a352b61fb20b626dcdf..ca993612ac0c149c30f22c760ad8600d43db8b8c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -30,7 +30,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAppInfoBase; import org.junit.Before; @@ -41,10 +40,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DrawOverlayDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) 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 a81035f17cc06c61d89f18509e13929723fcfc29..d6f41c7bc47e0bd8cf2fe27bfe7c5f46562584d9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -29,16 +29,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ExternalSourceDetailPreferenceControllerTest { @Mock 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 d3a90da27f5e54fd150d4b1c04402c5ece77640a..10c2675be8294da5ff37189154c1e801f01a5e46 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -33,7 +33,6 @@ import android.os.UserManager; import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; import com.android.settingslib.RestrictedSwitchPreference; @@ -43,12 +42,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class ExternalSourcesDetailsTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java index 29c783c183578e16d1f7352af8704819db80499c..da18c446a898ba0ce893d0eb207ccf49ceac8f48 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -17,9 +17,9 @@ package com.android.settings.applications.appinfo; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -34,19 +34,18 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class InstantAppButtonDialogFragmentTest { private static final String TEST_PACKAGE = "testPackage"; 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 6879b7de2f3aa4d110f8e4414213e44d8bfacf20..b7b67991778a194d786995bdc1275d4de05abe33 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -49,7 +49,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; 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; import com.android.settingslib.widget.LayoutPreference; @@ -59,10 +58,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppButtonsPreferenceControllerTest { private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer"; @@ -87,7 +87,7 @@ public class InstantAppButtonsPreferenceControllerTest { private InstantAppButtonsPreferenceController mController; @Before - public void setUp() throws PackageManager.NameNotFoundException { + public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); when(mContext.getPackageManager()).thenReturn(mPackageManager); 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 af38db390380be38f3231de6ad7c376c69235a08..79f3221a42bc8beacda61779d43168c62e5b6813 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.util.ArraySet; 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; @@ -41,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppDomainsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 358bd302b4d57e67fe54175e741d1b534c5d5557..94d12288d284490b2ba5243d499b7bd10f81b276 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -32,18 +32,18 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeSpentInAppPreferenceControllerTest { private static final String TEST_KEY = "test_tey"; @@ -92,7 +92,6 @@ public class TimeSpentInAppPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()) .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); - } @Test 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 d9e4ad4c3c2eaa40a88ead0dd2cf44dfee93c3f9..7bfffff2091c76191f20d734664e901f30a12a62 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java @@ -17,21 +17,21 @@ package com.android.settings.applications.appinfo; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 00ecece335552ac7fdb8c1d14773ec3e73ff0109..5460cd6300b6c1d9fcb6b05966413e1d7674b3b3 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WriteSystemSettingsPreferenceControllerTest { @Mock 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 74a38511c9b8e76286a199b101637a8959db4882..ea4129330bd4d6f33d47a0b307580a1755a72420 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static androidx.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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -34,7 +34,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,10 +41,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 10197aed4c8182a8cbfbbf0d4b1bd8b7ef79b5c1..1e6faa16b980fb90ac79a97b272ef2efa58c43f7 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static androidx.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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -37,7 +37,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -47,11 +46,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 e046219e2da557327b53be8aebbe90a9e534ab1f..f930106910ebc35599ef36b3391f7e98b5747638 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java @@ -18,14 +18,13 @@ package com.android.settings.applications.assist; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistSettingObserverTest { @Test 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 e445dc67d11c6642af4ebbfe8f06171386496481..3804d6d32f926d18168b41fa3c1eba7dc2fb020a 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -26,12 +26,11 @@ import android.content.ComponentName; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; @@ -40,7 +39,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAssistPickerTest { private static ComponentName sTestAssist; 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 02c1b8b439278081b4d7ca1da0537381609aaad0..3e46027c362c7145b944159e6f78bc0f6a59641c 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.applications.assist; 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -40,7 +40,6 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import com.android.internal.app.AssistUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; @@ -49,6 +48,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -56,7 +56,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAssistPreferenceControllerTest { private static final String TEST_KEY = "test_pref_key"; 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 ab4f3010f87203f3debe3a1b7daf11a4ad71a4ae..0063b54d87c294e7154d57d62fdc0f31bf442da9 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java @@ -20,13 +20,13 @@ 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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageAssistTest { private ManageAssist mSettings; 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 de602badec1261636bd7fde9051c3a2d4b3248d3..ee05d295dec68a92b805285e456d32a836003911 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,7 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; @@ -41,12 +40,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 b9a131643e95ec26578443d780864fac2a075899..31c00ecdc6e304d1858e0c05dfcc7f4f5d92cb97 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.applications.defaultapps; - import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; import static org.mockito.Mockito.mock; @@ -29,7 +28,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.applications.DefaultAppInfo; @@ -39,8 +37,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAppPreferenceControllerTest { private static final String TEST_APP_NAME = "test"; 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 f2d14acc2d29357299736454ee3144e01e0acd53..81a16d53a697ede1033b6f9856e558d94bb8e8ab 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -40,9 +40,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; 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.ShadowProcess; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; @@ -52,17 +49,15 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowProcess; import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowProcess.class, - ShadowSecureSettings.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowSecureSettings.class) public class DefaultAutofillPickerTest { private static final String MAIN_APP_KEY = "main.foo.bar/foo.bar.Baz"; @@ -98,7 +93,7 @@ public class DefaultAutofillPickerTest { mPicker = spy(new DefaultAutofillPicker()); - doReturn(application.getApplicationContext()).when(mPicker).getContext(); + doReturn(application).when(mPicker).getContext(); doReturn(mActivity).when(mPicker).getActivity(); doReturn(res).when(mPicker).getResources(); doReturn(mScreen).when(mPicker).getPreferenceScreen(); @@ -141,7 +136,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromManagedCaller() { setupUserManager(); setupCaller(); - ShadowProcess.setMyUid(MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -153,7 +148,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromMainCaller() { setupUserManager(); setupCaller(); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -165,7 +160,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromManagedClick() { setupUserManager(); setupClick(/* forWork= */ true); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -177,7 +172,7 @@ public class DefaultAutofillPickerTest { public void mUserId_shouldDeriveUidFromMainClick() { setupUserManager(); setupClick(/* forWork= */ false); - ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); + ShadowProcess.setUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE); mPicker.onAttach((Context) mActivity); mPicker.onCreate(null); @@ -210,7 +205,6 @@ public class DefaultAutofillPickerTest { } private void assertUserId(int userId) { - assertThat((Integer) ReflectionHelpers.getField(mPicker, "mUserId")) - .isEqualTo(userId); + assertThat((Integer) ReflectionHelpers.getField(mPicker, "mUserId")).isEqualTo(userId); } } 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 61466710bff74d58c5ff23a06b68f0b75bf90859..26ec1c62d0340c7ccf4466fa6237e9f731805331 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.view.autofill.AutofillManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,10 +39,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultAutofillPreferenceControllerTest { @Mock 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 3aa83a8ca1e2a594e5a981b4db39f9ee57375672..3386d83565fc236770f5802c54206257e6cfb831 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserPickerTest { private static final String TEST_APP_KEY = ""; @@ -58,7 +58,7 @@ public class DefaultBrowserPickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = new DefaultBrowserPicker(); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); } 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 cd3a42608646748f53a58b5f9593a8de4f68733b..7bfd299fb2090b19c8190de088c71c728d922cf4 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -18,9 +18,9 @@ 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.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -40,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -48,13 +47,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultBrowserPreferenceControllerTest { @Mock @@ -119,7 +119,6 @@ public class DefaultBrowserPreferenceControllerTest { when(mPackageManager.getApplicationInfoAsUser( eq(PACKAGE_NAME.toString()), anyInt(), anyInt())) .thenReturn(createApplicationInfo(PACKAGE_NAME.toString())); - final Preference pref = mock(Preference.class); assertThat(spyController.getDefaultAppLabel()).isEqualTo(PACKAGE_NAME); } @@ -170,15 +169,14 @@ public class DefaultBrowserPreferenceControllerTest { .thenReturn(createApplicationInfo(PACKAGE_TWO)); final List defaultBrowserInfo = - mController.getCandidates(mPackageManager, 0 /* userId */); + DefaultBrowserPreferenceController.getCandidates(mPackageManager, 0 /* userId */); assertThat(defaultBrowserInfo.size()).isEqualTo(2); } @Test public void getCandidates_shouldQueryActivityWithFlagsEquals0() { - - mController.getCandidates(mPackageManager, 0 /* userId */); + DefaultBrowserPreferenceController.getCandidates(mPackageManager, 0 /* userId */); verify(mPackageManager).queryIntentActivitiesAsUser( any(Intent.class), eq(0) /* flags */, eq(0) /* userId */); @@ -205,7 +203,8 @@ public class DefaultBrowserPreferenceControllerTest { public void hasBrowserPreference_shouldQueryIntentActivitiesAsUser() { when(mContext.getPackageManager()).thenReturn(mPackageManager); - mController.hasBrowserPreference("com.test.package", mContext, 0 /* userId */); + DefaultBrowserPreferenceController + .hasBrowserPreference("com.test.package", mContext, 0 /* userId */); verify(mPackageManager).queryIntentActivitiesAsUser( any(Intent.class), eq(0) /* flags */, eq(0) /* userId */); 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 e17b556307b78f791a88290813f5d2d96298e2a0..6aa4babff2b9e56efffdc9ddba3b069322445c5c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -28,18 +28,17 @@ import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultEmergencyPickerTest { private static final String TEST_APP_KEY = "test_app"; @@ -59,7 +58,7 @@ public class DefaultEmergencyPickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = spy(new DefaultEmergencyPicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); 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 4cf79df4d011ca49573df70682790e8945f6ba4e..be4fdbfb4d83f2e1bab2c1c84d4c74b37f981b3f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -18,10 +18,10 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; +import android.app.AppOpsManager; import android.content.ComponentName; import android.content.Context; import android.content.IntentFilter; @@ -42,7 +43,7 @@ import android.content.pm.UserInfo; import android.os.Build; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; @@ -51,13 +52,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomePickerTest { private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest"; @@ -67,6 +69,8 @@ public class DefaultHomePickerTest { @Mock private UserManager mUserManager; @Mock + private AppOpsManager mAppOpsManager; + @Mock private PackageManager mPackageManager; private Context mContext; @@ -75,7 +79,12 @@ public class DefaultHomePickerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + + FakeFeatureFactory.setupForTest(); + when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mActivity.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager); + when(mActivity.getApplicationContext()).thenReturn(RuntimeEnvironment.application); mPicker = spy(new DefaultHomePicker()); mPicker.onAttach((Context) mActivity); @@ -103,8 +112,7 @@ public class DefaultHomePickerTest { } @Test - public void getCandidates_allLaunchersAvailableIfNoManagedProfile() - throws NameNotFoundException { + public void getCandidates_allLaunchersAvailableIfNoManagedProfile() { addLaunchers(); List candidates = mPicker.getCandidates(); assertThat(candidates.size()).isEqualTo(2); 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 1083a99865391deef8c3817b49ca5e1140ac3bf5..c19b3159833b54be6d279226f43b065b1a462718 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -18,9 +18,9 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,19 +38,18 @@ import android.os.UserManager; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { private static final String TEST_PACKAGE = "test.pkg"; @@ -168,5 +167,4 @@ public class DefaultHomePreferenceControllerTest { when(mPackageManager.getHomeActivities(anyList())).thenReturn(null); 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 1d4b5c0485d7adb456e9a6d004c7f519535e0c12..c9f93635ee0aeb256bf358a54a6c2bc7b8b6561b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,17 +31,17 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 57d31cf84f9005fdf010dd502fba0060404005aa..743b096508cb4077776ce8341bb8167669b28b8f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java @@ -16,9 +16,9 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -38,10 +37,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultPhonePickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; @@ -65,7 +65,7 @@ public class DefaultPhonePickerTest { when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mActivity.getSystemService(Context.TELECOM_SERVICE)).thenReturn(null); mPicker = spy(new DefaultPhonePicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater); 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 ade62a13cb122bc726c050e98db97131981054bd..6fd65b25dd0ccf0e3791c13f8c190282ef0834cf 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.defaultapps; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,10 +36,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultSmsPickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; @@ -63,7 +63,7 @@ public class DefaultSmsPickerTest { MockitoAnnotations.initMocks(this); when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); mPicker = spy(new DefaultSmsPicker()); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mPm", mPackageManager); ReflectionHelpers.setField(mPicker, "mDefaultKeyUpdater", mDefaultKeyUpdater); 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 13789302765c1b003beadcc40297165529e0e235..0ef94ec1af38df26f778ddc9522dede1b3c96b30 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -25,13 +25,13 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; 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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 7409136251bd2b35a157b9f374ce72c7b21f30f1..680cd8aadf1ef53933621893b6eb9d45e776ab14 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -55,12 +55,11 @@ import static com.android.settings.applications.manageapplications.ManageApplica import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppFilterRegistryTest { @Test 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 2ae956185727233e5c0ddc2cd82654bad35b092e..b8d0f20a87c0e7a5bacc8214048838ad63aff4ff 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -27,15 +27,15 @@ import android.view.View; import android.widget.FrameLayout; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 4c9cacb6926d88780a6fa286aa20c49e5499cc1a..3dc0bc453ffcb533b755bb79b0a0df410cc6a76f 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -28,10 +28,10 @@ import static com.android.settings.applications.manageapplications.ManageApplica import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -59,7 +59,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; import com.android.settingslib.applications.ApplicationsState; @@ -68,13 +67,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.fakes.RoboMenuItem; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageApplicationsTest { @Mock @@ -144,7 +144,6 @@ public class ManageApplicationsTest { assertThat(mMenu.findItem(R.id.sort_order_frequent_notification).isVisible()).isFalse(); } - @Test public void onCreateView_shouldNotShowLoadingContainer() { ReflectionHelpers.setField(mFragment, "mResetAppsHelper", mock(ResetAppsHelper.class)); 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 d2b6d8a22905beb2f044a3b89fffa5b8e63e1604..8f5b0abf47b1f71d7d2922e102ebbaf7abd909ad 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import android.widget.FrameLayout; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import org.junit.Before; @@ -43,9 +42,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MusicViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; 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 64cc1cca1f79947fa445a4ef76613c2d980799e6..c4534745462c64fd09871da225c1fb60e7e194c3 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -32,7 +32,6 @@ import android.widget.FrameLayout; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import org.junit.Before; @@ -42,9 +41,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhotosViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java index be3d5544d809117907f57da66ac776bf7a1317f7..5f2a51478cbc6cda304bea88334ea4140a718f41 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java @@ -31,17 +31,17 @@ import android.widget.ProgressBar; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.UUID; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DomainAppPreferenceControllerTest { private ApplicationsState.AppEntry mAppEntry; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java index f09e400ad9658e428eb3a2d446e7cb4a059076f2..007aa86bd24ac0ffd264dcd3c7b6ba26378ef96d 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; -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.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppAccountPreferenceControllerTest { private static final String PREF_KEY = "instant_app_account_pref"; diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java index b4ff2fa645f2508161f8e3fcbb3275be6f07984d..9319c1310c50cdd4010c23fb91f53eeb44753a09 100644 --- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstantAppWebActionPreferenceControllerTest { private static final String PREF_KEY = "instant_app_web_action_toggle"; private static final String KEY_INSTANT_APPS_ENABLED = Settings.Secure.INSTANT_APPS_ENABLED; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java index ed72cf939150ce90be39498a68175037a731fc90..39d51fa6f50457108e67d8c79332c209d2f55ff8 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataSaverControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java index 27fb24e9e76b92bcfafd5bab93b4478dc6885c9e..0ed68cb5f77af6a085b13051b779b41b5fb3bff4 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighPowerAppsControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java index da2bc0a9ed41b25f98bc11537f811b0e1c255ac0..5bce86c386ca6662b5dc24a453cc3e16f751b1a0 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/ZenAccessControllerTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenAccessControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java index eaccdc0ac4b29698202945f639c116cab61e436b..18aaddd918407b43189bcefb9d9175373c96e3d8 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAddTest.java @@ -16,8 +16,8 @@ package com.android.settings.applications.specialaccess.deviceadmin; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -32,7 +32,6 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,9 +40,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminAddTest { private static final int UID = 12345; private static final String PACKAGE_NAME = "com.android.test.device.admin"; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java index 0873a18f652663931a0d273c2aade1e70da45478..17703e334dd77b1e90ca2afdd71e1c1867739682 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java @@ -16,7 +16,6 @@ package com.android.settings.applications.specialaccess.deviceadmin; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -31,16 +30,15 @@ import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminListItemTest { @Mock @@ -73,5 +71,4 @@ public class DeviceAdminListItemTest { assertThat(item.getName()).isEqualTo(label); assertThat(item.getDescription()).isEqualTo(description); } - } diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java index 18ecf7d165465c4b76205cb5045bac2c0a1744db..18b4f18d002f84674c6e6db518fa1fbcef3d8ec4 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.os.UserHandle; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceAdminListPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java index bba2b8b74eb050d02a2aca51d3f149c8a334d7b5..5746c18930124df455722cb15e83e166718e9ca3 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java @@ -30,16 +30,16 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureDetailPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java index b3d695849f452c9d3da91dae7ef0fdbaa25143f0..b6c6c6aad99105f41436da420d47910bde8d1fdd 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java @@ -25,14 +25,14 @@ import android.content.pm.ActivityInfo; import com.android.internal.logging.nano.MetricsProto; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureDetailsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java index deb66c86ab7c2b7a67dde10cbe8ec5c6e150aa1d..d08313c32c19bef057d006f6c231fccba84879bf 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications.specialaccess.pictureinpicture; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.pm.ActivityInfo; @@ -31,7 +31,6 @@ import android.os.UserManager; import android.util.Pair; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.common.collect.ImmutableList; @@ -43,8 +42,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureInPictureSettingsTest { private static final int PRIMARY_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java index 1f32b18da0e70b8840d6663e0e5a8e1c1aa28f5a..42a497af946cc3b27fccc16cb015436bf036e28b 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java @@ -23,15 +23,15 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsAccessTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java index 4244cd71b0e6e345b79d815b65fec342e48be665..0607e58985c8379ed6ca9b9f4a964d2186b32506 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java @@ -24,16 +24,15 @@ import static org.mockito.Mockito.spy; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java index 0dc7da3a312258668570ded472e08de5120cf8ee..53d46cab03a629690a3a9f65f0257c6a1dafc870 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java @@ -24,16 +24,15 @@ import static org.mockito.Mockito.spy; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PremiumSmsScreenPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java index 6239774e17cc6f92b99d57c85f3ce426c6199dce..32b18efafe24afcd377bbbbcb7dae5d7657724b5 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java @@ -23,17 +23,16 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnabledVrListenersControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java index 7a8dc5f203691cc1a39abdba48522aab10464fe4..bff7ea1fcec388da03a8483748451f21ea496c14 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java @@ -23,17 +23,16 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivityManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VrListenerScreenPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java index 3f0bc1d38951b769fbe4e589127c68cec97f9cfc..d6c7078a4a5cfa3233e56114a7136807b9d3f704 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettingsTest.java @@ -20,14 +20,14 @@ import android.app.settings.SettingsEnums; import com.android.internal.logging.nano.MetricsProto; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VrListenerSettingsTest { private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java index 43b707c80246cefb758f0544b796f3fcd5e46ce0..9b36d322aa067c7cc8a021564d0feedd88e29d49 100644 --- a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java @@ -23,17 +23,17 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class AutoRestorePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java index f23bc93c637c4ae2a478aa4ee96f09eab78f6702..1a6537b61ef19c232d1ef9379d85d86599dfe067 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java @@ -24,17 +24,17 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupDataPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java index bcd432acc893111121dfc9f0f862c2ed01600665..f8b3578d0d5db2a3b6a9b5bb4a55f075c2a84775 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java @@ -23,17 +23,17 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupInactivePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index f6276d0fd3ad662dc14afb1a8e2e859c3d0d4fd4..97ddc4bc1ade016ff800d552fde2cdf3b299b08c 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -18,9 +18,7 @@ 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.app.backup.BackupManager; import android.content.Context; @@ -29,26 +27,25 @@ import android.os.UserManager; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowApplication; +import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class) +@RunWith(RobolectricTestRunner.class) public class BackupSettingsActivityPreferenceControllerTest { private static final String KEY_BACKUP_SETTINGS = "backup_settings"; private Context mContext; - @Mock + private BackupManager mBackupManager; private UserManager mUserManager; @Mock @@ -56,20 +53,25 @@ public class BackupSettingsActivityPreferenceControllerTest { private BackupSettingsActivityPreferenceController mController; - private static boolean mBackupEnabled; - @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application.getApplicationContext()); - when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + + mContext = RuntimeEnvironment.application; + mBackupManager = new BackupManager(mContext); + + final ShadowApplication shadowApplication = ShadowApplication.getInstance(); + shadowApplication.grantPermissions(android.Manifest.permission.BACKUP); + shadowApplication.setSystemService(Context.BACKUP_SERVICE, mBackupManager); + + mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); mController = new BackupSettingsActivityPreferenceController(mContext, KEY_BACKUP_SETTINGS); } @Test public void updateState_backupOn() { - mBackupEnabled = true; + mBackupManager.setBackupEnabled(true); mController.updateState(mBackupPreference); String summaryString = mContext.getString(R.string.backup_summary_state_on); @@ -78,7 +80,7 @@ public class BackupSettingsActivityPreferenceControllerTest { @Test public void updateState_backupOff() { - mBackupEnabled = false; + mBackupManager.setBackupEnabled(false); mController.updateState(mBackupPreference); String summaryString = mContext.getString(R.string.backup_summary_state_off); @@ -87,14 +89,16 @@ public class BackupSettingsActivityPreferenceControllerTest { @Test public void isAvailable_systemUser() { - when(mUserManager.isAdminUser()).thenReturn(true); + final ShadowUserManager sum = Shadow.extract(mUserManager); + sum.setIsAdminUser(true); assertThat(mController.isAvailable()).isTrue(); } @Test public void isAvailable_nonSystemUser() { - when(mUserManager.isAdminUser()).thenReturn(false); + final ShadowUserManager sum = Shadow.extract(mUserManager); + sum.setIsAdminUser(false); assertThat(mController.isAvailable()).isFalse(); } @@ -103,13 +107,4 @@ public class BackupSettingsActivityPreferenceControllerTest { public void getPreferenceKey() { assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUP_SETTINGS); } - - @Implements(BackupManager.class) - public static class ShadowBackupManager { - - @Implementation - public boolean isBackupEnabled() { - return mBackupEnabled; - } - } } diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index 51a60168aef2f9023d68980d72f2ee56967558a3..931bc1e7ee01230dd24e5690c5ab275816c0742e 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -18,9 +18,9 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -45,6 +44,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; @@ -56,7 +56,7 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class, BackupSettingsActivityTest.ShadowUserHandle.class}) public class BackupSettingsActivityTest { @@ -155,12 +155,12 @@ public class BackupSettingsActivityTest { @Implements(BackupSettingsHelper.class) public static class ShadowBackupSettingsHelper { @Implementation - public Intent getIntentForBackupSettings() { + protected Intent getIntentForBackupSettings() { return mIntent; } @Implementation - public boolean isBackupProvidedByManufacturer() { + protected boolean isBackupProvidedByManufacturer() { return mIsBackupProvidedByOEM; } } @@ -174,7 +174,7 @@ public class BackupSettingsActivityTest { } @Implementation - public static int myUserId() { + protected static int myUserId() { return sUid; } diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index f3cb850ee59f3497d7cee5dcf7aecd00549508f1..9a809cc7ba2a5d85ef40c9240bc51a3d3f2903b9 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -36,19 +36,19 @@ import android.os.IBinder; import android.os.RemoteException; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = BackupSettingsHelperTest.ShadowBackupManagerStub.class) public class BackupSettingsHelperTest { @@ -317,7 +317,7 @@ public class BackupSettingsHelperTest { } @Test - public void testIsBackupProvidedByManufacturer_WithIntent() throws Exception { + public void testIsBackupProvidedByManufacturer_WithIntent() { String intent = "test_intent"; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -332,7 +332,7 @@ public class BackupSettingsHelperTest { } @Test - public void testIsBackupProvidedByManufacturer_WithoutIntent() throws Exception { + public void testIsBackupProvidedByManufacturer_WithoutIntent() { String intent = ""; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -347,7 +347,7 @@ public class BackupSettingsHelperTest { } @Test - public void testGetLabelProvidedByManufacturer() throws Exception { + public void testGetLabelProvidedByManufacturer() { String label = "test_label"; when(mContext.getApplicationContext()).thenReturn(mContext); @@ -362,7 +362,7 @@ public class BackupSettingsHelperTest { } @Test - public void testGetIntentProvidedByManufacturer() throws Exception { + public void testGetIntentProvidedByManufacturer() { String intent = "test_intent"; when(mContext.getApplicationContext()).thenReturn(mContext); diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index fb3f947eba2a3bba91c7a8f42119663598b0d3ae..c29dc1b1d8e107ab553e9ea554b91b003ef658d5 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -28,19 +28,18 @@ import android.content.Intent; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class) public class BackupSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java index 5609f354261c5e35cc665248c46e7b489dc1909d..610e6f85f10eb79db8477041f1e3fd708d480454 100644 --- a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java @@ -25,7 +25,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -33,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class ConfigureAccountPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java index caf20c847f05c6d0147ad1bc68aa8e0165fce5ea..ac92fb7aca420608910e18875cc862a2afbe493f 100644 --- a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Intent; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -32,10 +31,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class DataManagementPreferenceControllerTest { private final String KEY = "data_management"; @@ -70,8 +70,7 @@ public class DataManagementPreferenceControllerTest { mPSCD.setManageIntent(mIntent); mPSCD.setManageLabel(mTitle); mController.updateState(mPreference); - assertThat(mPreference.getTitle()) - .isEqualTo(mTitle); + assertThat(mPreference.getTitle()).isEqualTo(mTitle); } @Test diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java index 9907da08db8586d603386ee525ae34c2fda08ddb..ec924e54295df1bba1ce1128c3cabd05b7a277fd 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java @@ -37,19 +37,19 @@ import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FaceStatusPreferenceControllerTest { @Mock private LockPatternUtils mLockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java index 1d3d9ea9576237742f193cbccfbcf954421f31f8..0681e1c9aa53fcf32789a2c99e44789b1ed854d9 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java @@ -28,8 +28,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment; import com.android.settings.biometrics.fingerprint.FingerprintSettings .FingerprintSettingsFragment.DeleteFingerprintDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; @@ -37,11 +35,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowFragment.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowFragment.class) public class DeleteFingerprintDialogTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index fb50b3cfb930668375d839c350bc4eea9131983f..bfe7df307f2488f4d9e952fa9862d6937c30a74a 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -19,7 +19,7 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import android.content.Intent; @@ -31,8 +31,6 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; @@ -44,12 +42,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResourcesImpl.class, - ShadowUtils.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) public class FingerprintEnrollEnrollingTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index d51c6a58ed87b38e27d5625b76f5a52585be0c9b..d6adb5c78ef07ec1398adc27c0f635ce301ca731 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -18,8 +18,8 @@ package com.android.settings.biometrics.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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; @@ -35,8 +35,6 @@ import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; 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.ShadowUtils; import org.junit.After; @@ -47,13 +45,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUtils.class) public class FingerprintEnrollFindSensorTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 834aea5d5fafb07ebe2d50e70f2e0936f5b5aa43..93f8f3ab43d616567bbd93c906f203fda5bfd719 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -18,9 +18,9 @@ package com.android.settings.biometrics.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.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; @@ -28,15 +28,14 @@ import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintEnrollSuggestionActivityTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java index e8b27a8446fe121c5a7efca1ef098d0c9a75e110..32bd8d7e665f934ee8409fdfe98830d0dc2f566b 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java @@ -17,7 +17,7 @@ package com.android.settings.biometrics.fingerprint; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,15 +27,14 @@ import android.graphics.SurfaceTexture; import android.net.Uri; import android.view.TextureView.SurfaceTextureListener; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintLocationAnimationVideoViewTest { private FingerprintLocationAnimationVideoView mView; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java index 03b96ede471936635bd9a7c723c6514bbc87e723..116591d758aeade50d44a976b42b235d979c056d 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java @@ -29,16 +29,16 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index 7606202040a0161a9f9be7fc7f9f7271f9dd6dd6..f4410a36bf2fde7f4192591e935f60f2a18750ba 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -31,17 +31,17 @@ import android.os.UserManager; import com.android.internal.widget.LockPatternUtils; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintProfileStatusPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java index b47fd08d507bfa702d0bc467083ca3005a337dfe..18a05fd5a889120dc1812fbd535e0e741f026ee1 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -37,19 +37,19 @@ import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FingerprintStatusPreferenceControllerTest { @Mock @@ -123,8 +123,7 @@ public class FingerprintStatusPreferenceControllerTest { when(mFingerprintManager.isHardwareDetected()).thenReturn(true); when(mFingerprintManager.getEnrolledFingerprints(anyInt())) .thenReturn(Collections.singletonList(mock(Fingerprint.class))); - when(mFingerprintManager.hasEnrolledFingerprints(anyInt())) - .thenReturn(true); + when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(true); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java index b4823c04ea8520cb94ab49add9ce891447b23d8b..76dc736fa13714cf4e926763eb01e423fb02827c 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java @@ -28,7 +28,6 @@ import android.widget.Button; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -36,13 +35,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowKeyguardManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class}) public class FingerprintSuggestionActivityTest { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java index 86a5f7117d652e05da665e471bbb4f12d1e5ad17..7e971496aa72eeca444cb5f971682f28aa76c6f9 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -29,9 +29,6 @@ import androidx.appcompat.app.AlertDialog; import com.android.settings.R; 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.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -42,15 +39,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupFingerprintEnrollFindSensorTest { @Mock diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index a06c48d49732bcc70e5693dc426af700808430b5..d9d9197f22ad105e5f0870eef127801249d27ec1 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -32,7 +32,6 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowFingerprintManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowStorageManager; @@ -43,6 +42,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; import org.robolectric.shadows.ShadowKeyguardManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowFingerprintManager.class, ShadowLockPatternUtils.class, diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index 0083478039c21367773c244f798cc4a7ba6d1646..2e8d56d08ea21bc53f7133ceb88073785462e61d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -17,23 +17,22 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.Intent; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlwaysDiscoverableTest { @Mock diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index 06ce13f5f1f33181bbcd40431dac01523fb5e579..e57d5aa0ac92d56175d4be3206c78d8b620ac1d3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -30,7 +30,6 @@ import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager; @@ -41,6 +40,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -48,7 +48,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.Collection; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class, ShadowCachedBluetoothDeviceManager.class}) public class AvailableMediaBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index d8be01f9b78e215a509cb66f634070762670c9d1..eaa4c3cc96878ae7e22b8988b8376809e56564ff 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -18,11 +18,11 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -34,18 +34,15 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.widget.ActionButtonsPreference; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsButtonsController mController; private ActionButtonsPreference mButtonsPref; @@ -139,7 +136,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr mController.onDeviceAttributesChanged(); verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_disconnect); - // Click the button and make sure that disconnnect (not connect) gets called. + // Click the button and make sure that disconnect (not connect) gets called. mConnectButton.callOnClick(); verify(mCachedDevice).disconnect(); } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index aa3985a5f9aa27f35d7afb94e3a8b3c01600b72b..36efcbdf5cce26e0ce7c8cd4aaad58a88758fd90 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -16,7 +16,7 @@ package com.android.settings.bluetooth; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,17 +26,14 @@ import android.content.Context; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase { @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 509ebc8420eefc8edb7f95edb4b7ababce82aa2f..7313321722910039a2a0dfa2f4ab91c82331f08f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -30,7 +30,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,9 +37,10 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsControllerTestBase { protected Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index e62e338bcc5b4bd021c89c0f803da44486e63305..00ae6972ce826fc23ab6e034a72cea4e644e3d90 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -34,8 +34,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.settings.R; 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.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; @@ -49,11 +47,12 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) -@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class}) +@Config(shadows = ShadowEntityHeaderController.class) public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsHeaderController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java index 4fdef8ba309c171098b079c871de897e9647c191..9798745f6daa2085b70ca241296bc52b673e31a3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java @@ -17,16 +17,13 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settingslib.widget.FooterPreference; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowBluetoothDevice.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsMacAddressController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 5c4289cc82e9a98b6186a2346eb42657429ae0ec..9577fa7b5cf6df74bd87aeb3466f14c0f6606c91 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -33,8 +33,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowBluetoothDevice; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -46,6 +44,7 @@ import com.android.settingslib.bluetooth.PbapServerProfile; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.ArrayList; @@ -55,8 +54,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowBluetoothDevice.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothDevice.class) public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsProfilesController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 9651a899a8929b76e1456b539472251b952b5a89..21d62bc47de76ce670c68b1a000881a3c8680aa1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,7 +27,6 @@ import android.content.Context; import android.os.Bundle; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDeviceDetailsFragmentTest { private static final String TEST_ADDRESS = "55:66:77:88:99:AA"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 5d2718c52f3309cc182304ee9b84b9618873b32b..b49dc1398ca9d557d99af96b94caeec3ca3c13a5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import org.junit.Before; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 12c71936ebdd4823724b9094893446b7ec08657a..9e5b617634fd8fe8a8f99367180984b22da4fe67 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -33,8 +33,6 @@ import android.view.ContextThemeWrapper; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -45,12 +43,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowAlertDialogCompat.class}) public class BluetoothDevicePreferenceTest { private static final boolean SHOW_DEVICES_WITHOUT_NAMES = true; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 34b2d09716be7a61544e7fc2e93c0ee272273212..f93c61e894bfdf057b2d9f1dba4c7d461a9f0ae5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentTransaction; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceRenamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index c93d9653511e3e7d99dcd686b67d814d114f196f..b3205006c3c51a43c5abf61615f1b9fdd4d71231 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -17,7 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -33,7 +33,6 @@ import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; @@ -45,6 +44,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -52,7 +52,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index fe10d3e28c8d8531fff5d2a273570a141d5ff2e3..7d5b874ef4396e3ab6bedab985df5e0a292fefb8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -17,8 +17,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -37,8 +37,6 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; @@ -54,12 +52,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothAdapter.class) public class BluetoothEnablerTest { private static EnforcedAdmin sFakeEnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index f9129757b5207a917b7389fb0a50e06f9c69aca0..40489983acc897ebdfcfd3ea38480ccec2fd4a1a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -28,17 +28,16 @@ import android.os.Bundle; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothFilesPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java index 350ec9e3e6b5e30af14b9aad420d8df7fee30c77..c3956d31959a01e73a6c80d0735df5d3d9c1e796 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java @@ -20,15 +20,14 @@ import static com.google.common.truth.Truth.assertThat; import android.view.inputmethod.EditorInfo; 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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothNameDialogFragmentTest { private TestBluetoothNameDialogFragment mBluetoothNameDialogFragment; @@ -78,5 +77,4 @@ public class BluetoothNameDialogFragmentTest { return 0; } } - } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java index 5233d840858b50ae65125d4367e603f62450bbe6..6da9bf471f7b30fc4212b6c3db41588d0306c18b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java @@ -25,20 +25,19 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingControllerTest { private final BluetoothClass mBluetoothClass = new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE); diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index a9675668c5ec011e7f820ad7bf7b1ae87b84eac3..ac89b5b00279b7a72f31b473d5d10d1db536b14e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -18,9 +18,9 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -36,7 +36,6 @@ import android.content.res.Resources; import androidx.preference.PreferenceGroup; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -49,11 +48,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothPairingDetailTest { private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 7b50e213e9b19dbc37039b8f7df8949217d058e1..be733ec97d4a009cd82b68ec05cf9ba7838dc69a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -18,7 +18,7 @@ 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.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,8 +40,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -49,12 +47,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class BluetoothPairingDialogTest { private static final String FILLER = "text that goes in a view"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 27ea6be8d59d926c1765508aafb255695e7ab0dd..dfad37ae2530ec3ba80301ab0e642d1d249b2b2d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothPairingPreferenceControllerTest { private static final int ORDER = 1; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 369d2227dad327a3c0000ef4f7ba0dcfe95f0940..4deec56146340a4a9c75f2627ef16851821fde60 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -32,21 +32,18 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; -import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager; 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; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowLocalBluetoothProfileManager.class}) +@RunWith(RobolectricTestRunner.class) public class BluetoothSliceBuilderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index d3c195f8f431213eee003a175396707568769ea3..2aca4a3d229c25615a21e64340c671e7bc87a1fe 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -18,7 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -30,7 +30,6 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; @@ -41,6 +40,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -48,7 +48,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.HashSet; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothSummaryUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index e53c86e1c8b480f39daea6ea96a638685ae17d52..f40cc69c5234dff27f6df051e3b51c8e9579e3be 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.utils.AnnotationSpan; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.widget.FooterPreference; @@ -35,12 +35,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothSwitchPreferenceControllerTest { - public static final String BLUETOOTH_INFO_STRING = "When Bluetooth is turned on, your device" + private static final String BLUETOOTH_INFO_STRING = "When Bluetooth is turned on, your device" + " can communicate with other nearby Bluetooth devices."; @Mock private RestrictionUtils mRestrictionUtils; @@ -73,7 +74,7 @@ public class BluetoothSwitchPreferenceControllerTest { CharSequence text = AnnotationSpan.linkify( mContext.getText(R.string.bluetooth_scanning_on_info_message), info); - assertThat(mFooterPreference.getTitle()).isEqualTo(text); + assertThat(TextUtils.equals(mFooterPreference.getTitle(), text)).isTrue(); } @Test @@ -83,7 +84,6 @@ public class BluetoothSwitchPreferenceControllerTest { mController.updateText(false); assertThat(mFooterPreference.getTitle()).isEqualTo(BLUETOOTH_INFO_STRING); - } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index cbded4d9a8cfa365ef791ccdb570549c09bb22c0..db4da4fa036a2ecdab5b2450c24ef0dc244a7e81 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -17,7 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -32,7 +32,6 @@ import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager; @@ -43,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -50,7 +50,7 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.Collection; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class, ShadowCachedBluetoothDeviceManager.class}) public class ConnectedBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 649728ec63992bc7fb80c3aaca16308136c075c9..19de2e4b125d247e576b6de1d90a1d2cde211a88 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -32,7 +32,6 @@ import android.content.res.Resources; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.AbstractPreferenceController; @@ -42,12 +41,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceListPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java index 3023d71d58b44ee277630d19920293843a60d4c3..feaf68314205bc556466a6d2e0b48aba07f14cc8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java @@ -18,15 +18,14 @@ package com.android.settings.bluetooth; import static org.mockito.Mockito.verify; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevicePickerFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index d6d31ea05e01d63fe62090494594a9dbff14b756..44ffa5494a29bdf1c1eca5fd1795b60592258fab 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -29,8 +29,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import org.junit.Before; @@ -40,11 +38,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowDialog; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class ForgetDeviceDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java index b455fa2ba20a4a1f6845e4339e6fd3754d9ed175..9a6ad9194edc9417aa08c238cdc9b9e25f458fca 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java @@ -31,24 +31,24 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settingslib.bluetooth.LocalBluetoothManager; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class LocalDeviceNameDialogFragmentTest { @Mock @@ -73,7 +73,8 @@ public class LocalDeviceNameDialogFragmentTest { } @Test - public void diaglogTriggersShowSoftInput() { + @Ignore("b/120505691") + public void dialogTriggersShowSoftInput() { FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */, null /* bundle */); AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index 945d9b015534a1a945389b50b9bea56002febf6d..bd7f79e96eef93c90a97203bc0ba2c8666890fed 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -18,8 +18,8 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -35,9 +35,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; -import com.android.settings.testutils.shadow.ShadowDynamicLayout; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import org.junit.Before; @@ -47,12 +44,11 @@ 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.RobolectricTestRunner; import org.robolectric.shadows.ShadowDialog; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowDynamicLayout.class}) +@RunWith(RobolectricTestRunner.class) public class RemoteDeviceNameDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index e25e4b22744d8086bc203cf234c0b797bcf59950..03c713680e7948537ee2f13a64d6e93f96e46047 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -15,7 +15,7 @@ */ package com.android.settings.bluetooth; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -28,7 +28,6 @@ import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -37,10 +36,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class SavedBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java index 80366e2d686b6fcf5bca776984b1b1f95e5f8f33..1337f6640e1fb4fab45ecac87b029245df6afea1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java @@ -15,9 +15,9 @@ */ package com.android.settings.bluetooth; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,7 +26,6 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -36,8 +35,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UtilsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index 4f02062cc630537fb2a31f81c48eb81440e7ac74..e2b1270867ed4479675e8ce8e3dea9a7187f25d6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -20,8 +20,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertTrue; - +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -34,7 +33,6 @@ import android.text.TextUtils; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -42,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class AddDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index 7190874cb240804de6d5bbc978d1d7ea2e1a45ea..08f937b278870e0e9d4695b875e295230a2b0dcd 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -28,19 +28,19 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowNfcAdapter.class) public class AdvancedConnectedDeviceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index a1e7f222dbf46d68252ab7470acb618b3e06dbb7..658a952012d0154f58a4db68443f1f02028a72ad 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -19,8 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.drawer.CategoryKey; @@ -29,15 +27,14 @@ 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; import java.util.List; -; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowConnectivityManager.class}) public class AdvancedConnectedDeviceDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index dc2459b3304e193a5659b17a9ac4dec125a474c2..8470ef9c2529bdcb0a28407d9c4d63b32575f331 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,24 +38,26 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; +import com.android.settings.bluetooth.Utils; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class, ShadowBluetoothUtils.class}) public class AvailableMediaDeviceGroupControllerTest { @@ -97,7 +99,7 @@ public class AvailableMediaDeviceGroupControllerTest { doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); mAudioManager = mContext.getSystemService(AudioManager.class); doReturn(mEventManager).when(mLocalBluetoothManager).getEventManager(); @@ -107,6 +109,11 @@ public class AvailableMediaDeviceGroupControllerTest { mAvailableMediaDeviceGroupController.mPreferenceGroup = mPreferenceGroup; } + @After + public void tearDown() { + ShadowBluetoothUtils.reset(); + } + @Test public void onDeviceAdded_firstAdd_becomeVisibleAndPreferenceAdded() { mAvailableMediaDeviceGroupController.onDeviceAdded(mPreference); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index e192f8969cff2932e4e5850987a0795b9051f403..e119c18c5bc386c44acdfbe7a173cdba39b893d9 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -23,16 +23,16 @@ import android.text.TextUtils; import com.android.settings.R; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDashboardFragmentTest { private Context mContext; @@ -52,8 +52,6 @@ public class BluetoothDashboardFragmentTest { raw -> TextUtils.equals(raw.title, mContext.getString(R.string.bluetooth_settings))).findFirst().get(); - assertThat(fragmentResult).isNotNull(); } - } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index eecbca5afe2192c5d0bed6601fc67e678999934e..df8776128d735e1f6ce5b13cffa61066a0b7f2fc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -30,9 +30,7 @@ import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -41,15 +39,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowConnectivityManager.class, ShadowBluetoothAdapter.class}) public class ConnectedDeviceDashboardFragmentTest { + @Mock private PackageManager mPackageManager; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index a752a6cbfc71e3da0856310677f2de9a2f9416de..c9e2644b1b318b9772362515591a3ce3a5b46e07 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,12 +45,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class ConnectedDeviceGroupControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index 913e7d9132590b7012920fa637f2126bd6714d18..3cc125b4d255e45f692fcc8757597af1d8002103 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -35,9 +35,7 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; -import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -46,6 +44,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -54,8 +53,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowBluetoothAdapter.class) public class DiscoverableFooterPreferenceControllerTest { private static final String DEVICE_NAME = "device name"; private static final String KEY = "discoverable_footer_preference"; @@ -169,7 +168,7 @@ public class DiscoverableFooterPreferenceControllerTest { * Return a list of all the registered broadcast receivers */ private List getRegisteredBroadcastReceivers() { - List registeredBroadcastReceivers = new ArrayList(); + List registeredBroadcastReceivers = new ArrayList<>(); List registeredReceivers = mShadowApplication.getRegisteredReceivers(); for (ShadowApplication.Wrapper wrapper : registeredReceivers) { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 52b2e95593c0ed969b51f5cb8047ca8849f7053f..48f734d0e725bf6e6dd9826be53a7db31c4e0c77 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.PreferenceManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { private final String KEY = "test_key"; @@ -137,5 +137,4 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { assertThat(mPreferenceGroup.isVisible()).isFalse(); assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0); } - } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index e85626df5edea3650b0c8b3d8a817ce9a6701c07..c386719e23b4bf6f81618e647843d778e41fe5eb 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.PreferenceManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SavedDeviceGroupControllerTest { - private static final String PREFERENCE_KEY_1 = "pref_key_1"; @Mock private DashboardFragment mDashboardFragment; @@ -54,8 +53,6 @@ public class SavedDeviceGroupControllerTest { private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock private DockUpdater mSavedDockUpdater; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private PreferenceManager mPreferenceManager; @Mock private PackageManager mPackageManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java index 8816bec88f3496f368b297cd2d131153de63704c..f6b18a31810a6408166da4d22a226fd5cc048506 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java @@ -21,17 +21,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelConnectedDevicesPreferenceControllerTest { private Context mContext; @@ -54,7 +54,7 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { private static class ShadowAdvancedConnectedDeviceController { @Implementation - public static int getConnectedDevicesSummaryResourceId(Context context) { + protected static int getConnectedDevicesSummaryResourceId(Context context) { return R.string.settings_label_launcher; } } 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 643d6b2d8380796e1d7f0f70f8896176774fced2..b698b3aa366ca9179346cc684c458709f24e66a7 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java @@ -27,7 +27,6 @@ import android.hardware.usb.UsbPort; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConnectedUsbDeviceUpdaterTest { private Context mContext; 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 9ad73bedb6e4cc7fcd04fc01bca9f47b28bfb335..333d2b6cc52fbcdef790ea97bf170efea7224f57 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -33,15 +33,14 @@ import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbBackendTest { @Mock(answer = RETURNS_DEEP_STUBS) 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 7317ea99216e082cc76fe93562a76d6bfedaee7a..1689ee7344d99d6ab19255b81471fc2ddc7c4982 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java @@ -25,18 +25,17 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication.Wrapper; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbConnectionBroadcastReceiverTest { private Context mContext; 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 2c619dc4056a8cd174df93b1711fe4472becda6b..d8663fcde934e7a29df9cf569a6a14ac6a48ba21 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -20,19 +20,15 @@ import static android.net.ConnectivityManager.TETHERING_USB; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Mockito.doNothing; +import static org.mockito.ArgumentMatchers.anyLong; 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.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.hardware.usb.UsbManager; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; @@ -40,11 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import org.robolectric.util.FragmentTestUtil; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDefaultFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index dfd4eae7546dcdfe3ba5531624b41f0c2bb35676..3eda3d1ea7087f4060945ef6c5bbc9e0428d8f12 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsDataRoleControllerTest { private UsbDetailsDataRoleController mDetailsDataRoleController; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index 679a2a9fbee78d932f1b1ff6b690cbd4d94cbc01..fc93a58e677eace586b40026992a80f9a1e0872f 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -32,7 +32,6 @@ import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,6 +41,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -54,7 +54,7 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsFunctionsControllerTest { private UsbDetailsFunctionsController mDetailsFunctionsController; 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 2aa38d7188f42f493eee4ddc5f6150ed41ec3a04..d72214f1afda3bb53c922a92a2bcd0847039ace6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -31,7 +31,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,10 +45,11 @@ import org.mockito.Answers; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class UsbDetailsHeaderControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 856ac193d228585ca750f1d0c08faf6dd53cfa18..38c92c3a2d924771d82aaea2041a180a0f4572f7 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -35,7 +35,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -44,9 +43,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { private UsbDetailsPowerRoleController mDetailsPowerRoleController; @@ -201,7 +201,6 @@ public class UsbDetailsPowerRoleControllerTest { .isEqualTo(mContext.getString(R.string.usb_switching_failed)); } - @Test public void onClickDevice_timedOut_shouldShowFailureText() { mDetailsPowerRoleController.displayPreference(mScreen); @@ -222,7 +221,6 @@ public class UsbDetailsPowerRoleControllerTest { .isEqualTo(mContext.getString(R.string.usb_switching_failed)); } - private SwitchPreference getPreference() { return (SwitchPreference) mPreference.getPreference(0); } diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index 044ecc9961b3dc0760fdd4b4ecf7f4560f46197e..fc18f6008ad485e801f990c792bb5279427a9b5e 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -34,17 +34,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BasePreferenceControllerTest { private final String KEY = "fake_key"; @@ -207,9 +207,9 @@ public class BasePreferenceControllerTest { private class FakeBasePreferenceController extends BasePreferenceController { - public int mAvailable; + private int mAvailable; - public FakeBasePreferenceController(Context context, String preferenceKey) { + private FakeBasePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mAvailable = AVAILABLE; } @@ -219,7 +219,7 @@ public class BasePreferenceControllerTest { return mAvailable; } - public void setAvailability(int availability) { + private void setAvailability(int availability) { mAvailable = availability; } } diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java index 394437f9382c23c66b87c6d5e8086eee6c9e5dcd..d74fab3ca4b29c04aa475719f2b87abff5b26d47 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java @@ -16,13 +16,12 @@ package com.android.settings.core; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 6f309de2298fc24ad3b5a8c5c73e52a23161a59d..763cf156ceed4a63327cd08ee2ce58d08c5b5b6a 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -31,16 +31,16 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 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.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InstrumentedPreferenceFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java index 92879763fa05c5380a98f12bc79f3794ff059f86..68dfb7952cebeb82c864ff6723bc688fb2b54b5b 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java @@ -22,19 +22,19 @@ import android.content.Context; import com.android.settings.R; import com.android.settings.slices.FakePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; 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; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferenceControllerListHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java index ebf325273a08750f8a145dca98189f8cf2f40e88..9627a489c54fd77fef9cd416d491ac5be92bf666 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java @@ -34,11 +34,12 @@ import android.util.Xml; import com.android.settings.R; import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import java.util.Objects; 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; import org.xmlpull.v1.XmlPullParser; @@ -54,7 +55,7 @@ import java.util.List; * If changing a preference file breaks a test in this test file, please replace its reference * with another preference with a matchin replacement attribute. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferenceXmlParserUtilsTest { private Context mContext; @@ -370,7 +371,14 @@ public class PreferenceXmlParserUtilsTest { while ((type = parser.next()) != XmlPullParser.END_DOCUMENT && type != XmlPullParser.START_TAG) { } - while (parser.getName() != xmlType && parser.next() != XmlPullParser.END_DOCUMENT) { + while (true) { + if (Objects.equals(parser.getName(), xmlType)) { + break; + } + final int nextEvent = parser.next(); + if (nextEvent == XmlPullParser.END_DOCUMENT) { + break; + } } } catch (Exception e) { diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java index 3bcc2a2f3ff8c32186cc94ecdd3210d258e87aae..ba9cd5d8a2291491b0dfaafa5dbf854535afe69b 100644 --- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java @@ -19,15 +19,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSliderPreferenceControllerTest { private FakeSliderPreferenceController mSliderController; @@ -65,8 +65,7 @@ public class SettingsSliderPreferenceControllerTest { @Test public void testSliceType_returnsSliceType() { - assertThat(mSliderController.getSliceType()).isEqualTo( - SliceData.SliceType.SLIDER); + assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER); } private class FakeSliderPreferenceController extends SliderPreferenceController { @@ -74,7 +73,7 @@ public class SettingsSliderPreferenceControllerTest { private final int MAX_STEPS = 2112; private int mPosition; - public FakeSliderPreferenceController(Context context, String key) { + private FakeSliderPreferenceController(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index c57c384ab1902b1fc4c1067894204e53cb6d4456..dbe7a14bb6808891c663d1a3076fe4de35f577cb 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -21,14 +21,14 @@ import android.content.Context; import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliderPreferenceControllerTest { private FakeSlider mSliderController; @@ -64,8 +64,7 @@ public class SliderPreferenceControllerTest { @Test public void testSliceType_returnsSliceType() { - assertThat(mSliderController.getSliceType()).isEqualTo( - SliceData.SliceType.SLIDER); + assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER); } private class FakeSlider extends SliderPreferenceController { @@ -73,7 +72,7 @@ public class SliderPreferenceControllerTest { private final int MAX_STEPS = 2112; private int mPosition; - public FakeSlider(Context context, String key) { + private FakeSlider(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index d33d3fefc1654544dc1b5c915678906e06582a2b..8f9c33142d7d16d724d8ef0efde3a97dcd60d825 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -34,7 +34,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -43,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 53fe9a8b4543afacc465637612d03831b9a4a8c7..7cda34a16ad518ba92b961ed6a63a27dd1d4abd5 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -22,20 +22,20 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TogglePreferenceControllerTest { - FakeToggle mToggleController; + private FakeToggle mToggleController; - Context mContext; - SwitchPreference mPreference; + private Context mContext; + private SwitchPreference mPreference; @Before public void setUp() { @@ -94,7 +94,7 @@ public class TogglePreferenceControllerTest { private boolean checkedFlag; - public FakeToggle(Context context, String preferenceKey) { + private FakeToggle(Context context, String preferenceKey) { super(context, preferenceKey); } diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java index 078393f0df9da0f6c3235f379b6d79136e642162..9373edabab0bfb26acaeeb50f4df25b1fbc60d64 100644 --- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java +++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java @@ -16,11 +16,11 @@ import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.security.SecuritySettings; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.xmlpull.v1.XmlPullParser; @@ -32,7 +32,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class XmlControllerAttributeTest { // List of classes that are too hard to mock in order to retrieve xml information. @@ -53,8 +53,8 @@ public class XmlControllerAttributeTest { private static final String BAD_CLASSNAME_ERROR = "The following controllers set in the XML did not have valid class names:\n"; - Context mContext; - SearchFeatureProvider mSearchProvider; + private Context mContext; + private SearchFeatureProvider mSearchProvider; @Before public void setUp() { @@ -64,7 +64,7 @@ public class XmlControllerAttributeTest { } @Test - public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() { + public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() throws Exception { Set xmlSet = getIndexableXml(); xmlSet.addAll(whitelistXml); @@ -140,37 +140,34 @@ public class XmlControllerAttributeTest { return xmlResSet; } - private List getXmlControllers(int xmlResId) { + private List getXmlControllers(int xmlResId) throws Exception { List xmlControllers = new ArrayList<>(); XmlResourceParser parser; - try { - parser = mContext.getResources().getXml(xmlResId); + parser = mContext.getResources().getXml(xmlResId); + + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && type != XmlPullParser.START_TAG) { + // Parse next until start tag is found + } - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && type != XmlPullParser.START_TAG) { - // Parse next until start tag is found + final int outerDepth = parser.getDepth(); + final AttributeSet attrs = Xml.asAttributeSet(parser); + String controllerClassName; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) { + continue; } - final int outerDepth = parser.getDepth(); - final AttributeSet attrs = Xml.asAttributeSet(parser); - String controllerClassName; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) { - continue; - } - - controllerClassName = PreferenceXmlParserUtils.getController(mContext, attrs); - // If controller is not indexed, then it is not compatible with - if (!TextUtils.isEmpty(controllerClassName)) { - xmlControllers.add(controllerClassName); - } + controllerClassName = PreferenceXmlParserUtils.getController(mContext, attrs); + // If controller is not indexed, then it is not compatible with + if (!TextUtils.isEmpty(controllerClassName)) { + xmlControllers.add(controllerClassName); } - } catch (Exception e) { - // Assume an issue with robolectric resources } + return xmlControllers; } 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 4ddf53fe59555ddb0bcb31baf8be1f6eea685851..4062bfb8f6a5a703d0f042842fcad838b8589af5 100644 --- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java +++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java @@ -22,19 +22,19 @@ import com.android.settings.core.BasePreferenceControllerSignatureInspector; import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector; import com.android.settings.search.SearchIndexProviderCodeInspector; import com.android.settings.slices.SliceControllerInXmlCodeInspector; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import java.util.List; +import org.robolectric.RobolectricTestRunner; /** * Test suite that scans all classes in app package, and performs different types of code inspection * for conformance. */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CodeInspectionTest { private List> mClasses; diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java index d08a460b280c3fe824d0c8a86b7a47c7b6e168d8..988afe6bb59af5e61298540be8e28996ca275fcb 100644 --- a/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java @@ -16,7 +16,7 @@ package com.android.settings.core.codeinspection; -import static junit.framework.Assert.fail; +import static org.junit.Assert.fail; import android.util.ArraySet; 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 644f2497eee2d4c75abb152b560c0f4e2b24878e..c7557a2652bc811b84aac4cead32cb1d496174a8 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java @@ -19,15 +19,14 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Bundle; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 17fa381c872f4ad1204622683a97911c153f87ff..9b1c4110b6ac6349627884056b0a30212fe45a50 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java @@ -20,16 +20,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.overlay.FeatureFactory; -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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MetricsFeatureProviderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java index d8fb65df4e00c8515ccdf10a587853788c1dabc0..0de212d73d04df7897252cee48f99e55662621f9 100644 --- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java @@ -27,7 +27,6 @@ import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.util.Pair; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -35,13 +34,13 @@ import com.android.settingslib.drawer.Tile; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadows.ShadowApplication; import java.util.HashMap; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CategoryManagerTest { private ActivityInfo mActivityInfo; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 3ada961244db85e193999cea7525547a483a0447..2aa6ae22ff8f64897fce70acbb93c3eda50c73ba 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -26,9 +26,9 @@ import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -55,7 +55,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settings.testutils.shadow.ShadowTileUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -71,6 +70,7 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -79,7 +79,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class DashboardFeatureProviderImplTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java index 1f68e2f04ec55d384e607e1f3bdb78c865f7d7d9..c6b24658dbd922cf7a2a437ad94a4aa48e3d025b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java @@ -18,12 +18,11 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardFragmentRegistryTest { @Test public void pageAndKeyShouldHave1to1Mapping() { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 12154636b056dc27c20c7c94fd0862f432b36c6f..afbb658f9ec74d38ca3d09d875b64e64882d24a3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -51,13 +50,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index d5636a16d5b7d97ac5a2f0f10c90a334b1676681..8b4686bfc9acf5f0cb6c86efa9c62dc8a58486ab 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -19,7 +19,7 @@ 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.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; @@ -27,16 +27,15 @@ import android.content.Context; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DashboardTilePlaceholderPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index 3726fb4d2bd0b09352db10560b49771df5f7bfe3..9a5bef21fe8d0e41b68aa72ae12c4b5ae0cbb103 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -29,7 +29,6 @@ import android.content.pm.ActivityInfo; import android.os.Bundle; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; @@ -39,9 +38,10 @@ 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryLoaderTest { private static final String SUMMARY_1 = "summary1"; diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java index 8d7f841fe49e27a762f7ed6e9afbc7df7ea91968..2aee0dd347f43d61a867433c4d55a725d4cff639 100644 --- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java @@ -29,7 +29,6 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; @@ -38,8 +37,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProfileSelectDialogTest { private static final UserHandle NORMAL_USER = UserHandle.of(1111); @@ -62,7 +62,6 @@ public class ProfileSelectDialogTest { mActivityInfo = new ActivityInfo(); mActivityInfo.packageName = "pkg"; mActivityInfo.name = "cls"; - } @Test 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 3c97f489360ce014169effcfb51fa8f12b59e885..4bc4e79ab86cd26b3071a73b792fd1034d060f78 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -28,29 +28,24 @@ import android.hardware.fingerprint.FingerprintManager; import android.service.settings.suggestions.Suggestion; 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.ShadowSecureSettings; -import com.android.settingslib.suggestions.SuggestionControllerMixinCompat; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class SuggestionFeatureProviderImplTest { @Mock private Context mContext; @Mock - private SuggestionControllerMixinCompat mSuggestionControllerMixin; - @Mock private Suggestion mSuggestion; @Mock private ActivityManager mActivityManager; @@ -60,13 +55,12 @@ public class SuggestionFeatureProviderImplTest { private FingerprintManager mFingerprintManager; private ActivityInfo mActivityInfo; - private FakeFeatureFactory mFactory; private SuggestionFeatureProviderImpl mProvider; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mFactory = FakeFeatureFactory.setupForTest(); + FakeFeatureFactory.setupForTest(); mActivityInfo = new ActivityInfo(); mActivityInfo.packageName = "pkg"; mActivityInfo.name = "class"; @@ -82,11 +76,6 @@ public class SuggestionFeatureProviderImplTest { mProvider = new SuggestionFeatureProviderImpl(mContext); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void getSuggestionServiceComponentName_shouldReturnAndroidPackage() { assertThat(mProvider.getSuggestionServiceComponent().getPackageName()) 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 3a827960a32fdb14037c737fe1323724e7a8b6ac..9a9adf49e00f67170efcb2b96ec6043a8fb33d7e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import android.content.ComponentName; @@ -26,15 +26,15 @@ import android.content.Context; import android.os.Bundle; 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.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 99a3629c05af5c9642fe9923a017c9f3f89a0353..15f6c45f7a8d09d35d0de7835f1eb01ef5551cf9 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; @@ -33,9 +32,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDataUsagePreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 333c706ffe190981754d198c73686cc8f207fecb..37bb3cdfbc545c74febede3dfee389c6581c4c22 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -16,11 +16,10 @@ package com.android.settings.datausage; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -41,7 +40,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.EntityHeaderController; @@ -57,6 +55,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -64,7 +63,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class}) public class AppDataUsageTest { @@ -105,8 +104,8 @@ public class AppDataUsageTest { } @Test - public void bindAppHeader_workApp_shouldSetWorkAppUid() throws - PackageManager.NameNotFoundException { + public void bindAppHeader_workApp_shouldSetWorkAppUid() + throws PackageManager.NameNotFoundException { final int fakeUserId = 100; mFragment = spy(new AppDataUsage()); diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index e3034f88c213b2176b836b4096dd1cab76fc478d..5efeaf256ee685263f65621f31b9ae1713c07aea 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -18,8 +18,8 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -31,16 +31,15 @@ import android.util.ArraySet; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppPrefLoaderTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 1560af3261bd6a9388a29b7fa060dee697e5151f..33ae0645d45f504a9f9ecbb5461fe22597b7058f 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -18,12 +18,12 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; 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.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -45,7 +45,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; @@ -55,19 +54,20 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BillingCycleSettingsTest { private static final int LIMIT_BYTES = 123; @Mock - BillingCycleSettings mMockBillingCycleSettings; - BillingCycleSettings.ConfirmLimitFragment mConfirmLimitFragment; + private BillingCycleSettings mMockBillingCycleSettings; + private BillingCycleSettings.ConfirmLimitFragment mConfirmLimitFragment; @Mock - PreferenceManager mMockPreferenceManager; + private PreferenceManager mMockPreferenceManager; @Mock private NetworkPolicyEditor mNetworkPolicyEditor; @Mock @@ -87,7 +87,7 @@ public class BillingCycleSettingsTest { @Mock private SwitchPreference mEnableDataLimit; - SharedPreferences mSharedPreferences; + private SharedPreferences mSharedPreferences; @Before public void setUp() { @@ -167,5 +167,4 @@ public class BillingCycleSettingsTest { assertThat(billingCycleSettings.mNetworkTemplate).isNotNull(); } - } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index 744096622fd6417c7d0465b58983cc3bca8bffa5..9b14e192c2d4852cc165d35e72f7f859d36d10d6 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -29,16 +29,15 @@ import android.widget.LinearLayout; import androidx.preference.PreferenceViewHolder; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CellDataPreferenceTest { @Mock @@ -72,8 +71,7 @@ public class CellDataPreferenceTest { mListener.onSubscriptionsChanged(); assertThat(mPreference.isEnabled()).isFalse(); - when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())) - .thenReturn(mSubInfo); + when(mSubscriptionManager.getActiveSubscriptionInfo(anyInt())).thenReturn(mSubInfo); mListener.onSubscriptionsChanged(); assertThat(mPreference.isEnabled()).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index 0f9aed118e7a8d95e9268590690cd1614cc9dd61..39bf9cfa4127e141a2da00fc058045df84ce3ffd 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.util.SparseIntArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.UsageView; import com.android.settingslib.net.NetworkCycleChartData; import com.android.settingslib.net.NetworkCycleData; @@ -33,13 +32,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChartDataUsagePreferenceTest { // Test cycle start date, 20 Mar 2018 22:00: GMT diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index fcbffbeaf5a059196a9f759e8ebc03b349bf777e..6c8920194330702f680fd51df39d735361b808b5 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -5,14 +5,14 @@ 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.settingslib.net.DataUsageController.DataUsageInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageInfoControllerTest { private static final int NEGATIVE = -1; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 7a10d708b86076d4887437acf160f4d71fe9d280..427550cdd6a72a1965cfc797256b303f00802ca9 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -32,7 +32,6 @@ import android.os.Bundle; import android.provider.Settings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageListTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java index 151bc7dfa83f1521cb9c9c481e737107d81c0bab..ff8ef9327e7379ab36170e99c2e961d3db83738a 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java @@ -16,7 +16,7 @@ package com.android.settings.datausage; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,7 +26,6 @@ import android.content.Context; import android.content.Intent; import android.net.NetworkTemplate; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.net.DataUsageController; import org.junit.Before; @@ -34,9 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsagePreferenceTest { @Mock @@ -52,7 +52,6 @@ public class DataUsagePreferenceTest { mContext = RuntimeEnvironment.application; mPreference = spy(new DataUsagePreference(mContext, null /* attrs */)); doReturn(mController).when(mPreference).getDataUsageController(); - } @Test diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 517154867c57f3907b3dd9a9c368383e7d27fb12..d1cb63ed177db2d0d6f157b1c7cb58e13241ad58 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.NetworkPolicyEditor; @@ -60,12 +59,13 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class DataUsageSummaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 855e40bb9481b1ec0f572213fa23c41d9102fe23..ae11954d838dd25632e45be0f969de9c3f0379b2 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -42,8 +42,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settingslib.Utils; import org.junit.Before; @@ -51,14 +49,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageSummaryPreferenceTest { private static final long CYCLE_DURATION_MILLIS = 1000000000L; @@ -356,7 +353,6 @@ public class DataUsageSummaryPreferenceTest { assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE); } - @Test public void testSetProgress_updatesProgressBar() { setValidLabels(); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index d52793e405728788e64b70f753bc0aa8030a992d..66f916e9962b0af3145d37005e4e9691bf303d3d 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -18,10 +18,10 @@ package com.android.settings.datausage; 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.anyString; -import static org.mockito.Matchers.endsWith; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.endsWith; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -35,34 +35,29 @@ import android.net.NetworkPolicyManager; import androidx.fragment.app.FragmentActivity; import com.android.settings.dashboard.SummaryLoader; -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.ShadowDashboardFragment; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; import com.android.settings.testutils.shadow.ShadowUserManager; 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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @Config(shadows = { - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class, ShadowDataUsageUtils.class, ShadowDashboardFragment.class, ShadowUserManager.class, }) -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsageSummaryTest { @Mock @@ -97,8 +92,6 @@ public class DataUsageSummaryTest { @Test public void formatUsage_shouldLookLikeFormatFileSize() { - SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix, - "%1$s %2$s"); final long usage = 2147483648L; // 2GB final String formattedUsage = DataUsageSummary.formatUsage(mContext, "^1", usage).toString(); diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index 4bd584e7e91b86b4b1d4bdad353b6ee614a156bf..aa5db229957ac0723b62bdb5992cca8855a27cc6 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -18,9 +18,9 @@ package com.android.settings.datausage; 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; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,17 +30,16 @@ import android.net.ConnectivityManager; import android.telephony.TelephonyManager; import android.util.DataUnit; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class DataUsageUtilsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java index 983b96d8fb267a1c495223c16389cee59de0e666..84dc7393638a33056e6c390e0f00536c3f552912 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -41,7 +41,6 @@ import com.android.settings.R; import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settingslib.applications.ApplicationsState; @@ -52,6 +51,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implements; @@ -59,7 +59,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowRestrictedLockUtils.class, ShadowRestrictedLockUtilsInternal.class, diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index f1795f3d0e63443433dccc1f6cf5b453a7f35a14..183858e7eea9fae964ec33e51777888e6dc77d3e 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -25,20 +25,19 @@ import android.text.format.DateFormat; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoTimeFormatPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index 4d1ba380a5e51850d70153a36643d9bb27d0c010..f75c04ca9e4dc22d4de764db7e418a9e7ab91110 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoTimePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index 11b2efdfc07d58aa53ac6b57b79519bbe01a25d1..8a68f38fcfe6445d08eab90d129bd3b87ce3e9c7 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -35,10 +34,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AutoTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 0f5e0880b957510e12634d5df3ba04f63255ae79..e0770aa8c574f547ee566e2a7daa13b93a702fa9 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.AlarmManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DatePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index ee495d361f628ba1366c03ccc988f8faed0c0431..270b8741185021a401393238c7b0d632e7114439 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeChangeListenerMixinTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 5180455fc49585d0dbd0a83cdb3af62c0250f4d6..ec47a5496b55be0352056901f2ba816babd41d02 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -18,8 +18,6 @@ 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; @@ -27,23 +25,20 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeFormatPreferenceControllerTest { - @Mock(answer = RETURNS_DEEP_STUBS) - private PreferenceScreen mScreen; @Mock private UpdateTimeAndDateCallback mCallback; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index d73c8db54f1efda5062377baa96daba5762b8f3a..07975e3f0c2e96cc35a60760c1db3195f26bbd73 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index a8c09f26006c6001dbc24a1b4862c10939d5638a..f94e8d1aa5474b4f8a0e6b1ef01596155ce408ce 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index 365bfa2a33c28540858f6ad0c896cc5dc89b3fb3..4f23b60c38dcaed42f00ec22e3df0c2ba03f79b5 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -20,8 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,8 +28,9 @@ import java.util.List; import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { @Test @@ -48,7 +47,7 @@ public class BaseTimeZoneAdapterTest { items.add(secretCountry); TestTimeZoneAdapter adapter = new TestTimeZoneAdapter(items); - assertSearch(adapter, "", items.toArray(new TestItem[items.size()])); + assertSearch(adapter, "", items.toArray(new TestItem[0])); assertSearch(adapter, "Unit", US, UK); assertSearch(adapter, "kon", HK); assertSearch(adapter, "brit", UK); @@ -71,7 +70,7 @@ public class BaseTimeZoneAdapterTest { private final CountDownLatch mLatch = new CountDownLatch(1); private final TestTimeZoneAdapter mAdapter; - public Observer(TestTimeZoneAdapter adapter) { + private Observer(TestTimeZoneAdapter adapter) { mAdapter = adapter; mAdapter.registerAdapterDataObserver(this); } @@ -82,14 +81,14 @@ public class BaseTimeZoneAdapterTest { mLatch.countDown(); } - public void await() throws InterruptedException { + private void await() throws InterruptedException { mLatch.await(2L, TimeUnit.SECONDS); } } private static class TestTimeZoneAdapter extends BaseTimeZoneAdapter { - public TestTimeZoneAdapter(List items) { + private TestTimeZoneAdapter(List items) { super(items, position -> {}, Locale.US, false /* showItemSummary */, null /* headerText */); } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java index daa46a54ee191f5dea3721169d3ea7bbb6e15c3b..c892be84ee0e3863905b1f8a93c8cad38b0889b1 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java @@ -22,12 +22,12 @@ import android.content.Context; import android.icu.util.TimeZone; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.common.truth.Truth; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -37,16 +37,16 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class }) public class BaseTimeZoneInfoPickerTest { @Implements(android.text.format.DateFormat.class) public static class ShadowDataFormat { - public static String sTimeFormatString = ""; + private static String sTimeFormatString = ""; @Implementation - public static String getTimeFormatString(Context context) { + protected static String getTimeFormatString(Context context) { return sTimeFormatString; } } @@ -76,7 +76,7 @@ public class BaseTimeZoneInfoPickerTest { public static class TestBaseTimeZoneInfoPicker extends BaseTimeZoneInfoPicker { - public TestBaseTimeZoneInfoPicker() { + private TestBaseTimeZoneInfoPicker() { super(0, 0, false, false); } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java index 06d2b2bca7d01192eb688bbc6e577365c866a3b9..865c2eba383aea5abae603e1be1333082ee5f0a0 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -23,14 +23,13 @@ import android.content.Context; import androidx.preference.Preference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { private Activity mActivity; @@ -68,7 +67,7 @@ public class BaseTimeZonePreferenceControllerTest { private final Preference mTestPreference; - public TestPreferenceController(Context context, String preferenceKey) { + private TestPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); mTestPreference = new Preference(context); mTestPreference.setKey(preferenceKey); @@ -76,7 +75,7 @@ public class BaseTimeZonePreferenceControllerTest { } private static class TestPreference extends Preference { - public TestPreference(Context context, String preferenceKey) { + private TestPreference(Context context, String preferenceKey) { super(context); setKey(preferenceKey); } @@ -91,9 +90,8 @@ public class BaseTimeZonePreferenceControllerTest { isClicked = true; } - public boolean isClicked() { + private boolean isClicked() { return isClicked; } - } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index d7a54dbe215604c472d2626cdba7995319861068..1207621cc3ea3e869ef5995f91b3c220cd7093b9 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -25,13 +25,13 @@ import android.content.Context; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import libcore.timezone.CountryZonesFinder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Collections; @@ -39,14 +39,14 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedOffsetPickerTest { private CountryZonesFinder mFinder; @Before public void setUp() { - List regionList = Collections.emptyList(); + List regionList = Collections.emptyList(); mFinder = mock(CountryZonesFinder.class); when(mFinder.lookupAllCountryIsoCodes()).thenReturn(regionList); } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 6802e8aa30a4c376dae8bcc02fa5aecc1424436c..4a6f92f2a218a3eb30293009b1fc306912052a38 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -23,14 +23,13 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { private Activity mActivity; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index f33311523dcd34453fcfd55dcbf2472e8c8ac817..ea0be2458d698ef328220418b50a4a2e9cf3b47c 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -22,14 +22,13 @@ import android.app.Activity; import androidx.preference.Preference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionPreferenceControllerTest { private Activity mActivity; @@ -47,6 +46,5 @@ public class RegionPreferenceControllerTest { controller.updateState(preference); assertThat(controller.getSummary()).isEqualTo("United States"); assertThat(preference.getSummary()).isEqualTo("United States"); - } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java index 08759a2303aebd1b254e2c0a26109a35d1715204..c0553a58ac5596c5e32ff197efb790d294cbcf79 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -32,13 +32,13 @@ import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder; import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import libcore.timezone.CountryZonesFinder; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -49,7 +49,7 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { RegionSearchPickerTest.ShadowBaseTimeZonePicker.class, RegionSearchPickerTest.ShadowFragment.class, @@ -59,7 +59,7 @@ public class RegionSearchPickerTest { @Test public void createAdapter_matchRegionName() { - List regionList = new ArrayList(); + List regionList = new ArrayList<>(); regionList.add("US"); CountryZonesFinder finder = mock(CountryZonesFinder.class); when(finder.lookupAllCountryIsoCodes()).thenReturn(regionList); @@ -78,7 +78,7 @@ public class RegionSearchPickerTest { // http://b/75322108 @Test public void clickItemView_duringRegionSearch_shouldNotCrash() { - List regionList = new ArrayList(); + List regionList = new ArrayList<>(); regionList.add("US"); CountryZonesFinder finder = mock(CountryZonesFinder.class); when(finder.lookupAllCountryIsoCodes()).thenReturn(regionList); diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java index 220e677f9077d84ee0c05dd40eaa97593361b794..dd734bb6c62aa4aa890473b11221f13b57a44e5f 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java @@ -22,7 +22,6 @@ import android.icu.text.Collator; import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +31,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionZonePickerTest { @Test @@ -53,5 +53,4 @@ public class RegionZonePickerTest { Collections.sort(list, comparator); assertThat(list).isEqualTo(Arrays.asList(timeZone1, timeZone2, timeZone3, timeZone4)); } - } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java index 3c98985c12ba8732913d50fa290c216435a69ab6..6d1bf6698eb8d43101609657a4d39c04b1087ab9 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -23,14 +23,13 @@ import android.icu.util.TimeZone; import androidx.preference.Preference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { private Activity mActivity; @@ -59,6 +58,5 @@ public class RegionZonePreferenceControllerTest { assertThat(controller.getSummary().toString()).isEqualTo(expectedSummary); assertThat(preference.getSummary().toString()).isEqualTo(expectedSummary); assertThat(preference.isEnabled()).isFalse(); - } } diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java index 4793118b955b782e2be8db28bd7e4999ca0e4e5e..b9a3056ae911225acdc39262d4afd70ab0d4c949 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.text.Spannable; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SpannableUtilTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java index 948a92725a281188fc2bf8e08a671aecb83f0e93..5bbd01e2fadc17215b4dda775a15035b8d2f0103 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java @@ -22,16 +22,16 @@ import static org.mockito.Mockito.spy; import androidx.preference.Preference; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Date; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneInfoPreferenceControllerTest { @Test 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 32975bc1f0570ac46ce8c00b9ea87825b1380bd5..fd8b81f5c0e81e7657c52a6734d3b693d4e7bbc9 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java @@ -19,15 +19,15 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; import java.util.Locale; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneInfoTest { @Test diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 51d4a4b53a1fc93278eac3d7e6ccfd8939e56b23..f0f304b733d4db8bb95d9b9c99c0cb7e875239fb 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -22,24 +22,18 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.android.settings.datetime.timezone.model.TimeZoneData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.HashSet; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class, - }) +@RunWith(RobolectricTestRunner.class) public class TimeZoneSettingsTest { @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 0310c76dff91b1be50af31487963c4b966e8ec2a..253b537ab92cbd9ff1ee58e4c4feb6ff1e1ba8f6 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 @@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import libcore.timezone.CountryTimeZones; import libcore.timezone.CountryTimeZones.TimeZoneMapping; import libcore.timezone.CountryZonesFinder; @@ -34,8 +32,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TimeZoneDataTest { private CountryZonesFinder mCountryZonesFinder; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index b6a93227262ddae3fe8d327f8b7c3822ae09cee2..19ecc5444d1a2ed85d2dc05f6bc02b172ca48ee7 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -11,7 +11,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Ignore; @@ -19,10 +18,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagerDescriptionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 073078b465473c173c5c7a169d7fee58a02b802b..bd06744180258fcfdcd6a9229f6f0ca1f3ce6ee2 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -34,7 +34,6 @@ import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -44,9 +43,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagerSwitchBarControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2ed09420765b07ec2531186d6939f5357f0eccf4..bc495f65886a667b012480d3ccdecc9677a9798b 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -35,7 +35,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -43,9 +42,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AbstractBluetoothA2dpPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index e472dbb14a740aa61bdc78c163aff3f0946ad794..2e63f5a4e633027f5669ee1c3bd42471e41dd147 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -24,22 +24,20 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.os.UserManager; import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdbPreferenceControllerTest { @Mock @@ -47,8 +45,6 @@ public class AdbPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @Mock - private UserManager mUserManager; - @Mock private DevelopmentSettingsDashboardFragment mFragment; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 2175f39a170a1a941231f797728e0484a2bd9f95..51bc103d0eaa388c280be40d72b47fd31cc95ad0 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowAppsOnExternalPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java index 8b9b14f1e5851eec735fab95e842f95e3de1db1c..41a3b60b43796e1a49858055e918a8a8717acc92 100644 --- a/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowBackgroundActivityStartsPreferenceControllerTest.java @@ -24,19 +24,18 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowBackgroundActivityStartsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index accd05b8a109677c2a2dd3332f4d9ba480f08ac2..3b7ff9fa07773d166e2a86fff8544363cbd4d079 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -32,17 +32,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnimatorDurationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index e1fc149a19e43bb4fcf7c7aa66a77ca30bf273fc..bccb7b2610927b48c1e0f792e68b0489616b09a4 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppsNotRespondingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 6878c3241079cf4b448c25583402c153c87c95d9..82ca52a58f4cfc9c6c7e7d257edea94b1c0cb3d4 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BackgroundProcessLimitPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index 69c8d2b506d7aa221c6c6af9bf74edea74146adf..a1d479ff3ac71d8cb3a525881cc411b9291a938f 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothA2dpHwOffloadPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 9cc74369beab65203af34e8987d62831a4d06f84..2664bf95994e09e7a5ed339699a2fa0664aa5628 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAbsoluteVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index a4da1973db6805ad2c7c144ad8d89866f860a111..8c5cfd04fda55c65a34ca23767fd07e91157bbba 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 eb1737b2b64f8a316aa4e31225ac8448242e78e3..d9a26711115d59d4af827bcbc32b37c2b77876a2 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAudioChannelModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 23eea32dc9cca2ca82f52b4c68f9dc599fb67d85..7be8a8879e7bf6d133e362c8fbe94bf1e6fd472e 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 516c8b28af583cf40d22dde66013fd2791dde762..93d92fdc5082a309583554ffd5d5d21196e4a918 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 cb9337f4820a5289af0e4af8fdf1558dcfa5bfd4..3b469c5fdb1a94d4965e92b09010a834988dbd56 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -29,7 +29,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,9 +36,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 2d0c70a938cf40a7a250691e64849f89af78cf9e..3677f810aa830d2f03595f86830a19610c3982d7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -32,16 +32,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothAvrcpVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 9750d3a4ae79004037409199942471ca37f42752..7f9bc6c2240bfea1ebf47cd58de50d8b4d8b1b38 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -30,16 +30,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDeviceNoNamePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 030aaa2f8716f2f30f521a91d23a54131e4208de..98dc656d5f5ab9f1f540fc5563950f4e6ba5cbdb 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest { private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 0d75bdb5be7a81f1757819363fcc8345bfefbcc8..88cb29569d882bd757b4aefcea9cba2bfcd58ffe 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -30,15 +30,14 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothSnoopLogPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index b4ee99cb3192a59d5b0fa1c0c00e286d69a6af79..604dcb7a783a479953dbc8b36a805147909983a6 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -23,7 +23,7 @@ import static com.android.settings.development.BugReportInPowerPreferenceControl import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,16 +35,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 39fd368593abf21a6837877f61c42b784ed173d3..2d09c7d4e106cb388c216feddcd0efe8f09814cf 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -18,21 +18,20 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 d39a8c2b8fd3ff2a8dc180f1c0b316e7430d8282..aa9cb46db15725a3af7fc16f23f6b371929e09ce 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CameraLaserSensorPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java index af929fd8769ab043feb921249abc4ffd3390fea3..d955a6eab80345b7b4245f89fa3a6290b2f0440d 100644 --- a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.telephony.TelephonyManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class CbrsDataSwitchPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6ab4d4c1dc94006741b895280bbafdc02e4dccc7..3dc6ad9ba1f34ac052ceba254ef01da2fb343eb7 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.After; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +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.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ClearAdbKeysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 8d9549ab623eddd93c12be3fef695d007a0f0ff5..cf84618a6f40b408ed9f86a30876ed41d5666bea 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -30,17 +30,16 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CoolColorTemperaturePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index d2019280a65ceea96f01958ca5f261c1b187ac0d..20d7971d9f5d349df747e8f58eacb5bb98a2a92b 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugGpuOverdrawPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index a3728602796fd0d693ac395af2dcee23c941abb6..d3f3c7e0763d415b43f83d246d8e9c89e0441d25 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugNonRectClipOperationsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index 790b46a4c02eb9efa4b3c42caefd0e6fd8bf8825..b265113c92b75ef80c1b6028038630b067183444 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DebugViewAttributesPreferenceControllerTest { @Mock @@ -105,5 +104,4 @@ public class DebugViewAttributesPreferenceControllerTest { verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); } - } diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java index e6e8cb9e850b93fe0499eca58ef08195de5b0a57..108ec19ca6ea2890b065ff396dca63e87a21a565 100644 --- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java @@ -34,16 +34,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DesktopModePreferenceControllerTest { private static final String ENG_BUILD_TYPE = "eng"; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index 5eb21bdadc612676b3d868bd17f9b573fe445b6b..83a48809681698f4f90709289a9d6e8de9cf33fa 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -33,11 +33,7 @@ import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -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.ShadowAlertDialogCompat; -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; @@ -48,18 +44,20 @@ 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; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.androidx.fragment.FragmentController; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowUserManager; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowUserManager.class, ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowAlertDialogCompat.class}) public class DevelopmentSettingsDashboardFragmentTest { private ToggleSwitch mSwitch; @@ -75,7 +73,7 @@ public class DevelopmentSettingsDashboardFragmentTest { mSwitch = switchBar.getSwitch(); mDashboard = spy(new DevelopmentSettingsDashboardFragment()); ReflectionHelpers.setField(mDashboard, "mSwitchBar", switchBar); - mShadowUserManager = ShadowUserManager.getShadow(); + mShadowUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE)); mShadowUserManager.setIsAdminUser(true); } @@ -106,7 +104,6 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void searchIndex_pageDisabledBySetting_shouldAddAllKeysToNonIndexable() { final Context appContext = RuntimeEnvironment.application; DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false); @@ -119,7 +116,6 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Test - @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public void searchIndex_pageDisabledForNonAdmin_shouldAddAllKeysToNonIndexable() { final Context appContext = RuntimeEnvironment.application; DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true); @@ -289,7 +285,7 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Implementation - public static void show(DevelopmentSettingsDashboardFragment host) { + protected static void show(DevelopmentSettingsDashboardFragment host) { mShown = true; } } @@ -309,7 +305,7 @@ public class DevelopmentSettingsDashboardFragmentTest { @Implements(PictureColorModePreferenceController.class) public static class ShadowPictureColorModePreferenceController { @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } @@ -317,16 +313,15 @@ public class DevelopmentSettingsDashboardFragmentTest { @Implements(AbstractEnableAdbPreferenceController.class) public static class ShadowAdbPreferenceController { @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } @Implements(ClearAdbKeysPreferenceController.class) public static class ShadowClearAdbKeysPreferenceController { - @Implementation - public boolean isAvailable() { + protected boolean isAvailable() { return true; } } diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java index 48017919f44a4144eb18b69269d5d14f1bdb2e1f..6b4068d1d8c6f7b804447120db1c4fdbcb300d13 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java @@ -21,15 +21,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowToast; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentSettingsDisabledActivityTest { @Test diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index da0dcaf9ef59bc65c0601f85d07913fe93e34e7b..4e5716f93c969a6a28c75f0890fede4c38d415d7 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -27,7 +27,6 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; -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; @@ -40,13 +39,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUtils.class, ShadowUserManager.class}) public class DevelopmentSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 5c76e086a1084c74939fc16ea1c5222bcad5e47c..d5c0b5d4d99cc02e91d7becf10830896f8319897 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DisableAutomaticUpdatesPreferenceControllerTest { @Mock @@ -99,7 +98,6 @@ public class DisableAutomaticUpdatesPreferenceControllerTest { verify(mPreference).setChecked(false); } - @Test public void onDeveloperOptionsDisabled_shouldDisablePreference() { mController.onDeveloperOptionsDisabled(); diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index 1b25460355bdc37e0b2dda560e3359cd02930332..34112fd6a18941fc9092c99eb93e1ddd9130d242 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -36,8 +36,6 @@ import android.view.DisplayCutout; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,8 +44,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Arrays; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmulateDisplayCutoutPreferenceControllerTest { private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false, 1); @@ -86,14 +85,14 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void isAvailable_true() throws Exception { + public void isAvailable_true() { mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED); assertThat(createController().isAvailable()).isTrue(); } @Test - public void isAvailable_false() throws Exception { + public void isAvailable_false() { mockCurrentOverlays(); assertThat(createController().isAvailable()).isFalse(); @@ -119,7 +118,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void updateState_enabled() throws Exception { + public void updateState_enabled() { mockCurrentOverlays(ONE_DISABLED, TWO_ENABLED); mController.updateState(null); @@ -128,7 +127,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void updateState_disabled() throws Exception { + public void updateState_disabled() { mockCurrentOverlays(ONE_DISABLED, TWO_DISABLED); mController.updateState(null); @@ -137,7 +136,7 @@ public class EmulateDisplayCutoutPreferenceControllerTest { } @Test - public void ordered_by_priority() throws Exception { + public void ordered_by_priority() { mockCurrentOverlays(TWO_DISABLED, ONE_DISABLED); mController.updateState(null); diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index 1319c979fce7cd6f882ccb3207cc94f411d1741b..985e80892d26c4d6ed5ecd735d9cf13815242f79 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnableGnssRawMeasFullTrackingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index 21d14ca3fa233fee7a43bc9de444b18d83bc2296..80f348b9be4a4a4f2d75f1305f3449a23fbe9422 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -32,16 +32,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnableGpuDebugLayersPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index 8bbb7e2f0fbd4343dc20370ee84095a79a3c40f9..68cbd320303f600284fd15a4a0484108c2a6ccac 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -36,17 +36,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FileEncryptionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java index 8646e34779f974d4b6675ae3a98c784a58d9a509..0a99b94a79ee6640bd5c0a05bf189b056e89e200 100644 --- a/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceDarkPreferenceControllerTest.java @@ -28,16 +28,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ForceDarkPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index a238e7630e8045babd68a7de19f97ef6fe67e6a5..1cf58de56d4765e1629d4e8968bd059441e2106b 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.os.SystemProperties; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ForceMSAAPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 08fb23e885f4870e54f44c8deaa14c337f67d184..6162483c3ec28e164b1fc403ba816af439756197 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -33,16 +33,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FreeformWindowsPreferenceControllerTest { private static final String ENG_BUILD_TYPE = "eng"; @@ -74,7 +73,7 @@ public class FreeformWindowsPreferenceControllerTest { } @Test - public void isAvaiable_userBuild_shouldBeTrue() { + public void isAvailable_userBuild_shouldBeTrue() { mController = spy(mController); doReturn(USER_BUILD_TYPE).when(mController).getBuildType(); diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index d2e2d31ce56edf25b6907f614a554386a4435092..44181607c737c587c5cd926421a88ec80458b30a 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -28,16 +28,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GpuViewUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index 9ab7cec4a1198a7e0f79341033248344238aa425..38f674a5c047449a4cff9b1bb2a8f2052c32c4db 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.view.ThreadedRenderer; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HardwareLayersUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index 9a69acfb220c581347821d54cdecd539cea24244..424ec5ffe88a8fec773ef33590f20598c01c2b62 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.Before; @@ -44,10 +43,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HardwareOverlaysPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 9a80bea96cc83dde722b0980129a92945074b7d8..48289427fc5f89526d366d8e84eb5d18ca1268b9 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -33,16 +33,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HdcpCheckingPreferenceControllerTest { private static final String USER_DEBUG = "userdebug"; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 05aee64eac0b19e005bed536ff74e3fda84e406e..43f40af192cca75238dec8c7c358ff8363ef2cc5 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -31,16 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KeepActivitiesPreferenceControllerTest { private static final int SETTING_VALUE_ON = 1; diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index b0af1d5676e7e8e760dc4fcba4501cdbf12dcfb0..5297ef56964b699f001731a4932ad15177960bed 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -16,17 +16,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalBackupPasswordPreferenceControllerTest { @Mock @@ -47,8 +47,7 @@ public class LocalBackupPasswordPreferenceControllerTest { 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 04de34822ae020b71fe7d1accf1dcb39cc65d0b0..6f789701cf2ff03babcc9930c494f019dc14a2b1 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -32,15 +32,14 @@ import android.os.UserManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalTerminalPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index afbd806bb402d26995bf8c19e11640e904fa5176..325f4262f3ddb13f0e67fd708e3ac0073fb3e219 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LogPersistPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index aee0ba8190057e264d3a14473b36d06c07a3d2e2..0ac1c738ff68ff38806156c50228f7e3a1a3b467 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Context; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LogdSizePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java index 481e59869b2db1335d8b6ebeb9f6cb6443067f84..fa08653c8dbc19a2b3a2d70d361b53c29edce45f 100644 --- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -27,16 +27,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.applications.ProcStatsData; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MemoryUsagePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index 91bdad39f91fa57c751529d0f686debcbd34c5fa..914f1a751240ece2cc1899fdba2fddcf36201e32 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileDataAlwaysOnPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index f6214aea98863447ca40ba84f83d708039557b02..b0de02470ff83b2713d7c97f18d8959be7ca86ec 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -24,19 +24,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MockLocationAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index 965f756d6b9422ebc23c1a182025a3ab4bc519b1..7d08c66bb6cb5d17a8147a87ffa79de1ceb5c7d2 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -29,16 +29,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationChannelWarningsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index 03f82000feadda6fe819a1f236993822b24172a9..08502ddec664eb83a42a9759b45bd873630e5b4d 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.telephony.TelephonyManager; import androidx.fragment.app.FragmentManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -47,8 +46,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OemUnlockPreferenceControllerTest { @Mock @@ -187,7 +187,6 @@ public class OemUnlockPreferenceControllerTest { mController.onDeveloperOptionsEnabled(); verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_FACTORY_RESET); - } @Test diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 8140c324de0dda719fb771f85a7dbb1b9846ad3d..5cdb8e70bf534c50550211ecbf5838b8f37bd770 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,8 +40,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PictureColorModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 768ccec1c6a96b7cb297fb495471a7fdc89fe8c8..2984b34b92237e8f1e4d7a2421fd72645e3eed32 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PointerLocationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 1708068d359a992dec88eea8ebbe91ac39e36242..3fd480a259f6b22ff5cc61cf88a1d636422be784 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ProfileGpuRenderingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 046636b9f3219a5ac258c5d8d0e17ded35d9d534..9a69a0a62ddabded1dc622b3ef942d01abba4987 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 f79cbe0bf514fb2a1cf5d45e8b61001692522f50..c5fcfa8057fedbf34a3f4141373877a6de6856db 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -29,16 +29,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 6b083da5d798c45fd1bd899c632a0023cf9a97f2..16bb62644e6c09af0cad51b16e6e3385992731dc 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -29,16 +29,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecondaryDisplayPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 0d9eeda33a01400cd522bcc4008d9276cfe05289..2c85bb01c0612e96f0538120cef8c046976c82ce 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -37,17 +37,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SelectDebugAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 04b0b3f1ab629db085f3df381ab68f3145c6c876..c5078cbb3743f14cf71350de06b36c44a9898fd4 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -28,17 +28,16 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutManagerThrottlingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index 2acd44ad09201dce53c8c55ad0d337f62286237a..6674cd5f0626862e0bc7930b59e4132b8dc276f5 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -31,16 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowFirstCrashDialogPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index 38ec01b80dea20452ff4d9ff2341fb793ba97ff3..5c5bc8bef6172bd28f0800117a3a618c78b371c3 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.view.View; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowLayoutBoundsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index e768e522d878da1a49e3e4e31d5f8a6bd15dbd19..e08dd1c7ec130618e3795b54a6ab160f696df396 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.os.RemoteException; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.Before; @@ -44,10 +43,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowSurfaceUpdatesPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index b6d02caf11e9cce50845071dfc86ce220cf28e25..c97eab6f096faa14a8b641c3bcb143dc4de8c572 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowTapsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index 633e8e4055de5ecfe1b5ca765330552cc17ab274..93fc90dfde9ff7eb7275dacdd09257bb51ffc855 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimulateColorSpacePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java index 7a0dd68252600f064252d7376ee1eee966be1089..ecfe35af6957a4a0f628a305e321a2b97a60471a 100644 --- a/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.development; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @@ -25,19 +24,18 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmsAccessRestrictionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 97b4bf0ff93a7e258feca6ded59098205dbe2bcd..9dfe4e25cf41da370b4be0b465783ab9dfe70157 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -41,9 +40,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 3fceb1c79926e9aa472aa4567451872ddee0f12e..475c980e3ab38d50858072efe7f02ab77eccadd5 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -29,17 +29,16 @@ import android.view.IWindowManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StrictModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index dc1d6223eb5f0b6fcea4a7d012859c0a39f20270..6e347f5100c9c3ed343c225c8979772ca2d21a2c 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetheringHardwareAccelPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index 8bd43745a7503e1585c256718a5d9ed10dc30bd3..f06aa8de99d49ba7c7660ed49c7a8d36dfd3e2ca 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -33,17 +33,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TransitionAnimationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java index 307191200cb9dc18eb11ec859472943b69e638af..e92f1a56be946fa7ab95711ce2afad6cfb4e61a8 100644 --- a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java @@ -34,17 +34,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UpdatedGfxDriverDevOptInPreferenceControllerTest { @Mock @@ -72,7 +71,6 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { @Test public void handlePreferenceTreeClick_preferenceClicked_launchActivity() { final Intent activityStartIntent = new Intent(mContext, AppPicker.class); - final String preferenceKey = mController.getPreferenceKey(); doReturn(activityStartIntent).when(mController).getActivityStartIntent(); mController.handlePreferenceTreeClick(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index 0c82bb46574017aeb96dd625f937cad1a788bfe1..affae700d468df4dc0a4276a47cb733d12dc052e 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 fa04d69225fc4331926fd0f8fa917f0a3518738f..f0961f1202fdd00269e4f85bcdfc300d51689b9b 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -17,15 +17,14 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; 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.PackageManager; import android.content.pm.ResolveInfo; import android.provider.Settings; @@ -33,7 +32,6 @@ import android.provider.Settings.Global; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; @@ -42,13 +40,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VerifyAppsOverUsbPreferenceControllerTest { @Mock @@ -91,7 +90,7 @@ public class VerifyAppsOverUsbPreferenceControllerTest { final List resolveInfos = nonEmpty ? Collections.singletonList(mock(ResolveInfo.class)) : Collections.emptyList(); - when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt())) + when(mPackageManager.queryBroadcastReceivers(any(), anyInt())) .thenReturn(resolveInfos); } diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index 87d113504048314daead53aa7b4a5ab03e462474..b4d06face905232c6a5a23ff099da73ddfa93028 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -40,16 +40,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WaitForDebuggerPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index cc60b87845b5c9a1e34d9d5f41d82ec1e191f0da..b13d922f70d8dfa234f3b10b0998d2c1ec7a6a3c 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settingslib.applications.DefaultAppInfo; @@ -36,10 +35,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewAppPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e749ea64b3a7cc5f6240ae6222b56ca3d9dab968..60e7d47feea1a93c61a287f9f4fc4f53aa7e4aaa 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -31,17 +31,16 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiConnectedMacRandomizationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index f7124230e52554d43bd5c622921fb048c68af2f6..69cfe54c4389026880a44c8b1b262f8a4adf64e1 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -27,16 +27,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 daeff01ea633f8aad5e83a7bfa10d2b60bd3ce9d..c4041e04c5143cf2e743217f32fabc573d957572 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -25,15 +25,14 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiVerboseLoggingPreferenceControllerTest { @Mock private Context mContext; diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index 322eed789368673f848806b44a7abcbbbdc51949..4d8d3e8e72c44dea0814e9997aa7e4d537cb8cba 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -33,17 +33,17 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WindowAnimationScalePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java index 1268797db19c7531221dcf5cdf0938a4e9f83c90..f79419fde076932573cd0590c5f2cf4f92472045 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.After; @@ -42,13 +41,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutofillLoggingLevelPreferenceControllerTest { private static final int IDX_OFF = 0; @@ -133,7 +133,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_off() throws Exception { + public void onSettingsChange_off() { mHelper.setLoggingLevel(AutofillManager.NO_LOGGING); mController.updateState(mPreference); @@ -143,7 +143,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_debug() throws Exception { + public void onSettingsChange_debug() { mHelper.setLoggingLevel(AutofillManager.FLAG_ADD_CLIENT_DEBUG); mController.updateState(mPreference); @@ -153,7 +153,7 @@ public class AutofillLoggingLevelPreferenceControllerTest { } @Test - public void onSettingsChange_verbose() throws Exception { + public void onSettingsChange_verbose() { mHelper.setLoggingLevel(AutofillManager.FLAG_ADD_CLIENT_VERBOSE); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java index f95cb35cd85f3fb7adffffb09945b014fe0b5e51..02c7471af0c2f4b4c7e58c43ca60f3d041dc3fe6 100644 --- a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.view.autofill.AutofillManager; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutofillResetOptionsPreferenceControllerTest { @Mock @@ -83,11 +82,9 @@ public class AutofillResetOptionsPreferenceControllerTest { assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue(); - assertThat(mHelper.getLoggingLevel()) - .isEqualTo(AutofillManager.DEFAULT_LOGGING_LEVEL); + assertThat(mHelper.getLoggingLevel()).isEqualTo(AutofillManager.DEFAULT_LOGGING_LEVEL); assertThat(mHelper.getMaxPartitionsSize()) .isEqualTo(AutofillManager.DEFAULT_MAX_PARTITIONS_SIZE); - assertThat(mHelper.getMaxVisibleDatasets()) - .isEqualTo(0); + assertThat(mHelper.getMaxVisibleDatasets()).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java index bf0cf091fa04e2add8e82c0b7c1eb1b8cda662dc..7d7e36bef163d59331c7725a5cc8deb27879292b 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java @@ -22,15 +22,14 @@ import android.os.SystemProperties; import android.provider.Settings; import android.util.FeatureFlagUtils; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeatureFlagPersistentTest { private static final String TEST_FEATURE_NAME = "test_feature"; 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 24fe7336c12adc94baa6b75e2a6f41aaabcd4b8f..2e15967d835857e50cda802174b49067666989e1 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,16 +30,15 @@ import android.content.Context; import androidx.preference.PreferenceCategory; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 9f05ec4bdc5c31b3c7ba37cd32f284cb12ec7ec9..8afff8af7e4f048270f58bbfe639d8f51f6d59ac 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 c50f58a35b9482fd52487b4cc7685ef8c6f7ed76..fb6c988ad57deeb53d6d94ee153506831304d008 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java @@ -20,13 +20,13 @@ 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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 c3ef73bc8201545b91014a34b3b3d5af4110ea00..8b006fcdabd4ef8d6c3b4439e4597ca22482c730 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Ignore; @@ -47,12 +46,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentTilePreferenceControllerTest { private static final String SERVICE_INFO_NAME = "TestName"; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java index 12661e30a702d0ee90081edfc972ba8f73fb3814..9ab67c2719c1c475dd8ac28cf92f5b9d36908856 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java @@ -27,7 +27,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import android.service.quicksettings.Tile; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.development.DevelopmentSettingsEnabler; import org.junit.Before; @@ -36,11 +35,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DevelopmentTilesTest { @Mock 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 636b067e17d32755f66146fe646a6ab1bcdd1513..cafebe44c0b0c3c7be364b63ce77ba54618c4c37 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -37,7 +37,6 @@ import android.os.RemoteException; import android.view.IWindowManager; import android.widget.Toast; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; import org.junit.After; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WinscopeTraceTest { @Mock @@ -134,7 +134,6 @@ public class WinscopeTraceTest { assertThat(mWinscopeTrace.isEnabled()).isFalse(); } - @Test public void setIsEnableTrue_shouldEnableWindowTrace() throws RemoteException { mWinscopeTrace.setIsEnabled(true); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index 1560c51dd1eacad0eeb9254015be541da233c74f..564acfdd0fbd84b2ec58301d1b6ca42520f7cb78 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.accounts.Account; import android.content.Context; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BrandedAccountPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 9bec78d2bcd73528e2a5ceb94565ea209ac8d8a2..fb674abb0a083ed3d491dfb6a9482fb0dcef4b98 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -19,8 +19,8 @@ package com.android.settings.deviceinfo; 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.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -40,7 +40,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.DevelopmentSettingsEnabler; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowUserManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class BuildNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index aa84adfcaa1cb24ce37607062023c49d5d5e8c92..6418cf8bb6fd792b7cf209d5e368e160e0c5600d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -17,8 +17,8 @@ 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.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; @@ -35,17 +35,17 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceModelPreferenceControllerTest { private final String KEY = "device_model"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 9fb756ad204f68090b72ac4169b105d5a11e3d0d..5eb011449d215dcb08b3726c0b69921c83740a1e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -34,7 +34,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.widget.ValidatedEditTextPreference; @@ -44,11 +43,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class DeviceNamePreferenceControllerTest { private static final String TESTING_STRING = "Testing"; @@ -178,12 +178,6 @@ public class DeviceNamePreferenceControllerTest { } private void acceptDeviceName(boolean accept) { - mController.setHost( - new DeviceNamePreferenceController.DeviceNamePreferenceHost() { - @Override - public void showDeviceNameWarningDialog(String deviceName) { - mController.updateDeviceName(accept); - } - }); + mController.setHost(deviceName -> mController.updateDeviceName(accept)); } } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index 2c2c2f28ff74cba119825c55abcd0c445bcf75e1..1e3b11286ef8b776b329ecf54bc5fdce78160823 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -25,16 +25,15 @@ import android.os.SystemProperties; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FccEquipmentIdPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index e84aa65ba93af8066c9eb77700c83b6c26562a71..eef262c328b76ca48f4231eaa0c8ceed8be42b85 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,16 +26,15 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FeedbackPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java index abcce008b7bf917a841cce491e7d6379952b479a..29d9a7c8aa285005af5a50ad49d0831a40044c8e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,17 +29,14 @@ import android.view.View; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; 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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class HardwareInfoDialogFragmentTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java index 33d7e0c395cf86cbc85d8a5bb74a6b894bb54075..48170f3c691b0966662b2664a5a8fd01c77dbcb3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java @@ -19,15 +19,14 @@ import static com.google.common.truth.Truth.assertThat; 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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KernelVersionPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index 7b1de47555daff37b4179495c7e72e4bedcb1cc0..1da1f214638e706b50e06c9a02033bd9e9fdfa62 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -18,21 +18,20 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; 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.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManualPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 82056a2d22b761e094e360ee4f70d942e1058713..8e9a48f689401a13f94ef166135ce2a72a4a67b1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -34,16 +34,16 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhoneNumberPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java index 768a9ea225f8bfdd325e6a83f29ec7e5c7592bf0..9434daaab1f32bda1f1ead037435fb3e17875639 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java @@ -28,19 +28,18 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowStorageManager.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowStorageManager.class) public class PrivateVolumeForgetTest { private PrivateVolumeForget mFragment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java index 81c52c5122355e6169fd735aa0ef72705596e7c9..93a8be2ac1a3106ea6fae6f3c82aa32ebf066528 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java @@ -25,20 +25,19 @@ import android.os.storage.VolumeInfo; import android.widget.Button; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowStorageManager.class) public class PrivateVolumeFormatTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index a9664177acd90aa423adcd0d6b0111f044757682..ed7f16b24dbbc8bc2f7d13720c9e583260a0cbb5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,9 +38,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrivateVolumeOptionMenuControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java index 65f24e31617d633ef495afd5c8d949488853a1e9..9cb1d56d0cf1a987f9818ff29f687674dae70ec9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java @@ -23,18 +23,17 @@ import android.os.storage.VolumeInfo; import android.widget.Button; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowStorageManager; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowStorageManager.class) public class PrivateVolumeUnmountTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index 24028d22ad876241b6de6620ff6aa638d3e6b632..1b9c487d1195e9ceb3c67f027c42eaf8bc7757d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -17,8 +17,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,8 +29,6 @@ import android.content.pm.ResolveInfo; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,8 +38,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 bd0eaf37fa0078fe120d705276fd024520388f82..4e4375dc72e3124716d5f06517454be2fd23c896 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -35,7 +35,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.drawer.CategoryKey; @@ -43,11 +42,12 @@ 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 java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageDashboardFragmentTest { private StorageDashboardFragment mFragment; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index d42b40ff7d6936232e9c771ec6067be550a412e2..06194b4df33a67458865f66dfd253837b46a4a17 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -26,14 +26,14 @@ import android.widget.ProgressBar; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageItemPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 61fbf1f48d56911221d9257bc997606ea90c95b3..bb65fa248f7bbbf86b31b9bb99d3dbbeeeb7aef2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -17,7 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -25,7 +25,6 @@ import android.util.SparseArray; 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; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageProfileFragmentTest { @Captor diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java index 2598105d33b3aeebfa531d9fc62c2275e9765466..aad3f30fa538eebb3012e6102d6eafdc19cfc5c5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java @@ -27,7 +27,6 @@ import android.app.Activity; import android.content.Intent; import android.os.storage.VolumeInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import org.junit.Before; @@ -38,8 +37,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageSettingsTest { @Mock @@ -77,5 +77,4 @@ public class StorageSettingsTest { verify(mActivity, never()).startActivity(null); verify(mActivity).startActivity(any(Intent.class)); } - } diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java index 00484df3efc9293fdd977c7ce92f66b154f9bfb0..6a192038e65de56b7baa6de7cba344d30d386483 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.os.storage.VolumeInfo; import android.text.format.Formatter; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import org.junit.Before; @@ -38,13 +37,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelStoragePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java index 6ea36a06836aa7c4d65de5d4468a1308459b3330..a61bf4875cdc6f68e49c51f2fa777dcb9daf1aa5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialogTest.java @@ -22,16 +22,13 @@ import static org.mockito.Mockito.verify; import android.content.DialogInterface; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceNameWarningDialogTest { - DeviceNameWarningDialog mDialog; - @Test public void onClick_okSetsName() { final FragmentController fragmentController = diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java index e304a1e710d97b2ba2fe6d928698585aedff5916..fefad5ec6f5c4fad1e02384212f46aa4e0d6aa15 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java @@ -37,8 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.deviceinfo.BuildNumberPreferenceController; 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.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.AbstractPreferenceController; @@ -48,6 +46,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -57,7 +56,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MyDeviceInfoFragmentTest { @@ -91,7 +90,6 @@ public class MyDeviceInfoFragmentTest { } @Test - @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/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java index 25fbeee178a820aa5b50baae2599f9909c704ad7..988a94b66506225edc13b9e4ae977920fc1f825b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.deviceinfo.aboutphone; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; @@ -25,14 +24,13 @@ import android.content.Context; import android.os.Build; import android.provider.Settings.Global; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelAboutDevicePreferenceControllerTest { private Context mContext; @@ -59,6 +57,4 @@ public class TopLevelAboutDevicePreferenceControllerTest { Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test"); assertThat(mController.getSummary().toString()).isEqualTo("Test"); } - - } 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 3e7ce7a93138059335670d7e6ac151a021184241..0f561641a52a48306738a0349e51e4b83cd9a6d4 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -31,7 +31,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.os.SystemProperties; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class BasebandVersionDialogControllerTest { 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 21388818eafadaf2e7b9644998c8fe40b70d6977..a1e8813a8db71e12a8c3858414c2c7e04e40d3b5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -24,15 +24,14 @@ import static org.mockito.Mockito.verify; import android.os.Build; import android.text.BidiFormatter; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BuildNumberDialogControllerTest { @Mock 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 7b07db486289d74de1855929e30022e9ad376e65..0c57941126efeb1f12fd38ff2b722414826e2eae 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -34,17 +34,16 @@ import android.os.Build; import android.os.UserManager; 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.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 e7b189344002ae5a8a0d47939c3a39ee4b7a22a3..fc674f0b8b0375f2dc63b7f69e3747e2a4eb15b9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -27,7 +27,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,16 +34,17 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FirmwareVersionPreferenceControllerTest { - private final String KEY = "firmware_version"; + private static final String KEY = "firmware_version"; @Mock private Fragment mFragment; 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 24f4874dbe0b54b8f6799dfeb1d1f8c7907b4945..52af2809ffbd3d73009e2d98e8b1573d3b009570 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.DeviceInfoUtils; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KernelVersionDialogControllerTest { @Mock 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 fe7633c297818e3938c9954aa0dcba77ab38f550..8c334ccd85ab01747286f2d549f6232b52b65b80 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -35,19 +35,18 @@ import android.content.pm.PackageManager; import android.os.Build; 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.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityPatchLevelDialogControllerTest { @Mock 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 7213d12d1183ac619928cd91051c57d8203a79db..a19f022d983363ffdf95b2519e7404777b5b400e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -36,17 +36,16 @@ import android.content.Context; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 e633ea21478929b87aff89bc404cb47fc3245ef2..e56baa14cce7288946e721be5d8ddc85e0f7cd05 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -44,10 +43,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImeiInfoPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java index 0547d5f34dd0dadfee5b5bf58c548e038916347e..3a6e494ff040a39e28bf2b4471d9de2166e52c25 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CopyrightPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java index d4962e0b8ca07128810b900393b6180624830619..f51c7ad0e439e78c32fe21afa729e17e277efc55 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,20 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LicensePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java index 7e4a92aaefcca37b0da4a12fc598c82486d921e1..2a91fe1ee6573a9fe114fe5c4852ee8656af5dbe 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TermsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java index c5862e22f7e0f66d656fb7f28876de854231c03b..c06f069e2d539f14ddb7c85444ab26b0a10deca1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WallpaperAttributionsPreferenceControllerTest.java @@ -20,16 +20,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperAttributionsPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java index eff152011d62809e0ba7e29ca26a7e7b38e3f9ba..55604c33373092784978cfa6d133abe83cc82b06 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.deviceinfo.legal; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -33,19 +33,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewLicensePreferenceControllerTest { @Mock 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 541e9d3f4541031cd0f660a8daeb0b8e074e0b61..07e42706716686fd53ecaff39f9d1497eedbf000 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -69,7 +69,6 @@ import android.telephony.euicc.EuiccManager; import androidx.lifecycle.LifecycleOwner; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -77,12 +76,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimStatusDialogControllerTest { @Mock @@ -398,5 +398,4 @@ public class SimStatusDialogControllerTest { verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID); verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID); } - } 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 e814fc49c4d36d7cea7714012d5feede785f8f9d..059ad425ed27c03d028406921dc75fe56739a66a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,10 +40,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 4c767a2ae026ce5418f8f2c09026ca19f9585bba..70620bc31550d2f39c0632515770d5882e1b39e2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -42,7 +42,6 @@ import com.android.settings.core.BasePreferenceController; 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.widget.MasterSwitchPreference; import org.junit.Before; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutomaticStorageManagementSwitchPreferenceControllerTest { @Mock @@ -73,7 +73,7 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application.getApplicationContext(); - final FeatureFactory factory = FeatureFactory.getFactory(mContext); + FeatureFactory.getFactory(mContext); mController = new AutomaticStorageManagementSwitchPreferenceController(mContext, "testkey"); mController.setFragmentManager(mFragmentManager); 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 5da2cb8b09534262f11ac27f5622df9b4e3390d9..d4048acea90314b619285f7c9086fdc61e7d99ea 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -46,7 +46,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.SparseArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; @@ -55,9 +54,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CachedStorageValuesHelperTest { private Context mContext; @@ -76,7 +76,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() throws Exception { + public void getCachedPrivateStorageInfo_cachedValuesAreLoaded() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -104,7 +104,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_cachedValuesAreLoaded() throws Exception { + public void getCachedAppsStorageResult_cachedValuesAreLoaded() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -143,7 +143,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfDataIsStale() throws Exception { + public void getCachedPrivateStorageInfo_nullIfDataIsStale() { when(mMockClock.getCurrentTime()).thenReturn(10000000L); mSharedPreferences .edit() @@ -169,7 +169,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_nullIfDataIsStale() throws Exception { + public void getCachedAppsStorageResult_nullIfDataIsStale() { when(mMockClock.getCurrentTime()).thenReturn(10000000L); mSharedPreferences .edit() @@ -196,7 +196,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfWrongUser() throws Exception { + public void getCachedPrivateStorageInfo_nullIfWrongUser() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -222,7 +222,7 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedAppsStorageResult_nullIfWrongUser() throws Exception { + public void getCachedAppsStorageResult_nullIfWrongUser() { when(mMockClock.getCurrentTime()).thenReturn(10001L); mSharedPreferences .edit() @@ -249,20 +249,20 @@ public class CachedStorageValuesHelperTest { } @Test - public void getCachedPrivateStorageInfo_nullIfEmpty() throws Exception { + public void getCachedPrivateStorageInfo_nullIfEmpty() { final PrivateStorageInfo info = mCachedValuesHelper.getCachedPrivateStorageInfo(); assertThat(info).isNull(); } @Test - public void getCachedAppsStorageResult_nullIfEmpty() throws Exception { + public void getCachedAppsStorageResult_nullIfEmpty() { final SparseArray result = mCachedValuesHelper.getCachedAppsStorageResult(); assertThat(result).isNull(); } @Test - public void cacheResult_succeeds() throws Exception { + public void cacheResult_succeeds() { when(mMockClock.getCurrentTime()).thenReturn(10000L); final StorageStatsSource.ExternalStorageStats externalStats = new StorageStatsSource.ExternalStorageStats(22222L, 2L, 20L, 200L, 2000L); @@ -294,5 +294,5 @@ public class CachedStorageValuesHelperTest { assertThat(mSharedPreferences.getLong(TOTAL_BYTES_KEY, -1)).isEqualTo(6000L); assertThat(mSharedPreferences.getInt(USER_ID_KEY, -1)).isEqualTo(0); assertThat(mSharedPreferences.getLong(TIMESTAMP_KEY, -1)).isEqualTo(10000L); - }; + } } 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 d525501c777dddbc26352f2b4ad5bf017e50292c..0b56cda2c605f29cdc91d5860bb62caddce7b036 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -20,7 +20,7 @@ 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.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.drawable.UserIconDrawable; @@ -46,12 +45,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecondaryUserControllerTest { private static final String TEST_NAME = "Fred"; 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 0741d6d6248319c91e3115a16121e9042efbac4d..feb3533e49e6384f1b32dc25e8f31a53a4d86d5e 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -54,22 +54,20 @@ import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.deviceinfo.PrivateVolumeSettings; import com.android.settings.deviceinfo.StorageItemPreference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageItemPreferenceControllerTest { private Context mContext; @@ -90,10 +88,8 @@ public class StorageItemPreferenceControllerTest { private MetricsFeatureProvider mMetricsFeatureProvider; @Before - public void setUp() throws Exception { + public void setUp() { MockitoAnnotations.initMocks(this); - SettingsShadowResources.overrideResource("android:string/fileSizeSuffix", "%1$s %2$s"); - SettingsShadowResources.overrideResource("android:string/gigabyteShort", "GB"); when(mFragment.getActivity()).thenReturn(mActivity); when(mFragment.getFragmentManager()).thenReturn(mFragmentManager); when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction); @@ -111,11 +107,6 @@ public class StorageItemPreferenceControllerTest { inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void testUpdateStateWithInitialState() { assertThat(mPreference.getSummary().toString()) 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 6892191943f7ff18d420de5187d7a17c10d26c93..4f72318f731f5beb6aef8a83c13fedb6dbdfcfe4 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static com.android.settings.TestUtils.KILOBYTE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -42,26 +42,19 @@ import androidx.preference.PreferenceViewHolder; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; import java.io.File; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class -}) +@RunWith(RobolectricTestRunner.class) public class StorageSummaryDonutPreferenceControllerTest { private Context mContext; @@ -73,8 +66,6 @@ public class StorageSummaryDonutPreferenceControllerTest { @Before public void setUp() throws Exception { - SettingsShadowResources.overrideResource( - com.android.internal.R.string.config_headlineFontFamily, ""); mContext = spy(Robolectric.setupActivity(Activity.class)); mFakeFeatureFactory = FakeFeatureFactory.setupForTest(); mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider(); @@ -88,11 +79,6 @@ public class StorageSummaryDonutPreferenceControllerTest { mHolder = PreferenceViewHolder.createInstanceForTests(view); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void testEmpty() { final long totalSpace = 32 * GIGABYTE; 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 4706b7d959dc1101742689931bf187c2f9d63d94..9e2b45d05a1134f736337efa3710149fafbacc93 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -38,7 +38,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settings.deviceinfo.StorageProfileFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.drawable.UserIconDrawable; @@ -49,8 +48,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserProfileControllerTest { private static final String TEST_NAME = "Fred"; 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 1e912ba2b292fff8e0be7b155d64205e5ff16a70..5aa9f72e386d45235164cc2058f6ce7a5736eaf9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -2,20 +2,20 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.os.storage.VolumeInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.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 0c8bc7b7ab70fe2d888fbc6da625105a76ac422f..f8e0a74b8c2eb55aabab6b1d5e52d21deb08cc9e 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.provider.Settings; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; @@ -34,10 +33,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayAlwaysOnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index a8d5e19ab7908c01c73899e2836d0d5a7ae16427..e36b39476259cfc419e3f64c87dc71be2ff99b82 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -20,9 +20,9 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -44,11 +43,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayNotificationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index 05226c359de61a4d7d6e29f2eae293c97816deb0..e7daac897501e98876d1342abbe0bd466471ff8d 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -30,16 +30,15 @@ import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.util.IconDrawableFactory; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppGridViewTest { @Mock diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 6f667ae8c11e29ef2a7693ce9fb553ff42d699c2..a8edc44d8a99ddd343dbe9ac12cd19bad5aec4df 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.content.Context; import android.provider.Settings; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoBrightnessPreferenceControllerTest { private static final String PREFERENCE_KEY = "auto_brightness"; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index e4db3ee1ac5d8ffa99eb81263fdb899b1cd6fe67..a26e0b70dddbf28892050b21b60bfbc1dd668dfa 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.ContentResolver; @@ -33,9 +33,7 @@ import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRotationPolicy; -import com.android.settings.testutils.shadow.ShadowSystemSettings; import org.junit.After; import org.junit.Before; @@ -44,11 +42,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = ShadowSystemSettings.class) +@RunWith(RobolectricTestRunner.class) public class AutoRotatePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -71,11 +69,6 @@ public class AutoRotatePreferenceControllerTest { mController = new AutoRotatePreferenceController(mContext, "auto_rotate"); } - @After - public void tearDown() { - ShadowSystemSettings.reset(); - } - @Test public void isAvailableWhenPolicyAllows() { assertThat(mController.isAvailable()).isFalse(); diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 708c9c1a177d2298da531d3989966ffa2db31667..bbc8faf1b0c18b8da466ff41b74ff152c0e5629c 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -23,14 +23,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryPercentagePreferenceControllerTest { private static final String PREF_KEY = "battery_percentage"; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index a22a15910530a143b67c230861e18d2972518e09..f5af290dcc293e9314549c44c5c6fdfa27658897 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static android.content.Context.POWER_SERVICE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; @@ -35,19 +35,18 @@ import android.provider.Settings.System; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BrightnessLevelPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index eddace14207efff16dd27b93c06cd42f5d469c40..e7f025f7be46cd0fe8d7fef7fccfb89419481cc8 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -28,16 +28,16 @@ import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ColorModePreferenceControllerTest { @Mock @@ -99,5 +99,4 @@ public class ColorModePreferenceControllerTest { assertThat(mPreference.getSummary()) .isEqualTo(mContext.getText(R.string.color_mode_option_natural)); } - } diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 57f0ebbc6a0d7e173ab0c6159d4c67b7df84b56c..a87dddd2aada16226309590abc6e41b8c415982e 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -34,24 +34,25 @@ import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.LayoutPreference; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ColorModePreferenceFragmentTest { @@ -71,6 +72,11 @@ public class ColorModePreferenceFragmentTest { ReflectionHelpers.setField(mFragment, "mController", mController); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void verifyMetricsConstant() { assertThat(mFragment.getMetricsCategory()) diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java index db33cbe93fb2f1dddab6a7003409ccea0002f2e5..0344a14cfd3e5cdf823ba1b06e71422c61cb61c7 100644 --- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.content.Context; import androidx.preference.ListPreference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DarkUIPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java index 5169290c0cea0702d751f99ea4544cfaebe877cb..888b711efc5f5f7a460ace21a47e5e5dc87efad6 100644 --- a/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/FontSizePreferenceControllerTest.java @@ -23,14 +23,14 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FontSizePreferenceControllerTest { private static final String TEST_KEY = "test_key"; @@ -54,23 +54,20 @@ public class FontSizePreferenceControllerTest { @Test public void getSummary_noScale_shouldReturnDefaultSummary() { - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[1]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[1]); } @Test public void getSummary_smallScale_shouldReturnSmall() { Settings.System.putFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE, 0.5f); - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[0]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[0]); } @Test public void getSummary_largeScale_shouldReturnLarge() { Settings.System.putFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE, 1.5f); - assertThat(mController.getSummary()) - .isEqualTo(mFontSizeArray[3]); + assertThat(mController.getSummary()).isEqualTo(mFontSizeArray[3]); } } diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index 84d184de41989f4bdf73fa09dc3c2d28cf57f2f0..6e23e5f67fea592af75ba88c6e1d081ae78563ac 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,19 +26,20 @@ import android.view.View; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.widget.LayoutPreference; +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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayActivationPreferenceControllerTest { @@ -59,6 +60,11 @@ public class NightDisplayActivationPreferenceControllerTest { mController.displayPreference(mScreen); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java index 945b50f9d5c537e5c6405cb6020a368ab1e77c06..85d497a173351e083d0a63c456d12fa4ee7b766d 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java @@ -20,16 +20,17 @@ import android.content.Context; import android.provider.Settings.Secure; import com.android.internal.app.ColorDisplayController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayAutoModePreferenceControllerTest { @@ -43,6 +44,11 @@ public class NightDisplayAutoModePreferenceControllerTest { "night_display_auto_mode"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java index c49c174be42c7177e0aa0ffe99a0cd6ba6be1408..d02faa920c47d65ca81da95f73fdad93101c734a 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayCustomEndTimePreferenceControllerTest { @@ -37,6 +38,11 @@ public class NightDisplayCustomEndTimePreferenceControllerTest { RuntimeEnvironment.application, "night_display_end_time"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java index a38c755a65ced931bb760be956a98477efec7a80..3a618efc401838cce99256280342a9576ef4a35a 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayCustomStartTimePreferenceControllerTest { @@ -37,6 +38,11 @@ public class NightDisplayCustomStartTimePreferenceControllerTest { RuntimeEnvironment.application, "night_display_start_time"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java index e43e7259ffc774c210379b32bd46c0e8a9fcdca2..18aff9d77c8dcf847f041ae656d8a4ef86312cec 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java @@ -16,16 +16,17 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayFooterPreferenceControllerTest { @@ -36,6 +37,11 @@ public class NightDisplayFooterPreferenceControllerTest { mController = new NightDisplayFooterPreferenceController(RuntimeEnvironment.application); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable() { SettingsShadowResources.overrideResource( @@ -49,5 +55,4 @@ public class NightDisplayFooterPreferenceControllerTest { com.android.internal.R.bool.config_nightDisplayAvailable, false); assertThat(mController.isAvailable()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java index 99dcb5a7d96d9673ac1e8d590c670f2416c2c4ee..2edec2ed5b582cb200fb58d7cc0936ff05152dfa 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java @@ -19,16 +19,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayIntensityPreferenceControllerTest { @@ -42,6 +43,11 @@ public class NightDisplayIntensityPreferenceControllerTest { "night_display_temperature"); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void isAvailable_configuredAvailable_isActivated_available() { SettingsShadowResources.overrideResource( diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java index 3822f73cbfa3eaff2a5d58393a65146a5d86bb12..c066e6cdbce8699e74b8215956c053d0c12fa029 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java @@ -7,19 +7,17 @@ import android.provider.Settings.Secure; import com.android.internal.app.ColorDisplayController; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class}) public class NightDisplayPreferenceControllerTest { @After diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index 80d8987abeb9f7995dd8890d0c41eca1f126a015..2ae33cf7bdc65500cae74de522ac22303b7d4e40 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -20,17 +20,17 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NightDisplaySettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java index 082207629ea0b3898742c46b4eb9c2cb1324b9fe..c1a46f2ba51ae56066e91671323a8c36ee5c63d9 100644 --- a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java @@ -23,15 +23,14 @@ import static org.mockito.Mockito.spy; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenZoomSettingsTest { private ScreenZoomSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index a5b34498a906b62b508a0e87eaee9d9b7cde11ef..9026c04269fabe5b240260abd5f2a056661d1ca8 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowOperatorNamePreferenceControllerTest { private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name"; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 9d15ca06dfed02bb1863ca5147b0b276dd8aa575..41947a064d32d4b7e3f8c142fe4eeabb0bcf9acb 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -18,9 +18,9 @@ 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.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,11 +45,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ThemePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java index a1d94fa7f9f2110c94543b81c7029162800ee162..55fcdacea51ce59eedd06c45d15bac9c116b83b7 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java @@ -22,7 +22,6 @@ import static org.robolectric.RuntimeEnvironment.application; import android.util.AttributeSet; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils; @@ -31,10 +30,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class TimeoutListPreferenceTest { private static final CharSequence[] VALUES = @@ -49,7 +50,10 @@ public class TimeoutListPreferenceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mPreference = new TimeoutListPreference(application, mock(AttributeSet.class)); + + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + + mPreference = new TimeoutListPreference(application, attributeSet); ReflectionHelpers.setField(mPreference, "mInitialValues", VALUES); ReflectionHelpers.setField(mPreference, "mInitialEntries", ENTRIES); ReflectionHelpers.setField(mPreference, "mEntries", ENTRIES); diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index f6f0d7f7fc6bcaf6baa581d6a89f05f30fd576e9..cf0e6606112111370242fecc51ea0b453e50828e 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.os.UserManager; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -44,6 +43,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -51,7 +51,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDevicePolicyManager.class) public class TimeoutPreferenceControllerTest { @@ -134,7 +134,7 @@ public class TimeoutPreferenceControllerTest { verify(mPreference, times(2)) .removeUnusableTimeouts(longCaptor.capture(), adminCaptor.capture()); - assertThat((long) longCaptor.getValue()).isEqualTo(0); + assertThat(longCaptor.getValue()).isEqualTo(0); assertThat(adminCaptor.getValue()).isNotNull(); } diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java index fe4fcc8e2258185f7f455c21e09fcbf043ff989e..9ad05ce56e26463b83c188e4e9a69d5a1d859736 100644 --- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java @@ -31,7 +31,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,8 +40,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelDisplayPreferenceControllerTest { @Mock private Context mContext; @@ -55,10 +55,8 @@ public class TopLevelDisplayPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); when(mContext.getPackageManager()).thenReturn(mPackageManager); - when(mContext.getString(R.string.config_wallpaper_picker_package)) - .thenReturn("pkg"); - when(mContext.getString(R.string.config_wallpaper_picker_class)) - .thenReturn("cls"); + when(mContext.getString(R.string.config_wallpaper_picker_package)).thenReturn("pkg"); + when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls"); mController = new TopLevelDisplayPreferenceController(mContext, "test_key"); } @@ -88,5 +86,4 @@ public class TopLevelDisplayPreferenceControllerTest { assertThat(mController.getSummary()) .isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary)); } - } diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index b7fb5edc412b57bc010edb018dcb6ffa1c1e7d3f..05ee422a3e2237abf5096bf816d19dd119efd337 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -26,19 +26,19 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; 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; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 b4305b6e9d66337f8f87fc51e5fd75ce39b85073..a641b192e8ed221bc38a2bb8fd51e9d1c7e8e1ce 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,8 +38,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 a26997c135a3ff8168204fc254184831b3a58037..88d0ff1846e4b21a024f92196d778d6d80bffacc 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -28,7 +28,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; @@ -38,11 +37,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CurrentDreamPickerTest { private static String COMPONENT_KEY = "mocked_component_name_string"; @@ -62,7 +62,7 @@ public class CurrentDreamPickerTest { FakeFeatureFactory.setupForTest(); mPicker = new CurrentDreamPicker(); - mPicker.onAttach((Context) mActivity); + mPicker.onAttach(mActivity); ReflectionHelpers.setField(mPicker, "mBackend", mBackend); } diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index d3244416d20c968d7be21fc9b4de53aff0b737c6..8a5ee20c4f14c3559ac4c1d09342e86e12f3b328 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.GearPreference; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; @@ -37,12 +36,13 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CurrentDreamPreferenceControllerTest { private CurrentDreamPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index b9703e2176ba14ca684b77777b2c4b2db016aafc..a5545645e9b6a60cc35b5329286f6454cf637a37 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -24,7 +24,6 @@ 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; @@ -33,29 +32,30 @@ import org.junit.runner.RunWith; import java.util.Arrays; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DreamSettingsTest { private static final List KEYS = Arrays.asList( - DreamSettings.WHILE_CHARGING_ONLY, - DreamSettings.WHILE_DOCKED_ONLY, - DreamSettings.EITHER_CHARGING_OR_DOCKED, - DreamSettings.NEVER_DREAM - ); + DreamSettings.WHILE_CHARGING_ONLY, + DreamSettings.WHILE_DOCKED_ONLY, + DreamSettings.EITHER_CHARGING_OR_DOCKED, + DreamSettings.NEVER_DREAM + ); private static final @WhenToDream int[] SETTINGS = { - DreamBackend.WHILE_CHARGING, - DreamBackend.WHILE_DOCKED, - DreamBackend.EITHER, - DreamBackend.NEVER, - }; + DreamBackend.WHILE_CHARGING, + DreamBackend.WHILE_DOCKED, + DreamBackend.EITHER, + DreamBackend.NEVER, + }; private static final int[] RES_IDS = { - R.string.screensaver_settings_summary_sleep, - R.string.screensaver_settings_summary_dock, - R.string.screensaver_settings_summary_either_long, - R.string.screensaver_settings_summary_never + R.string.screensaver_settings_summary_sleep, + R.string.screensaver_settings_summary_dock, + R.string.screensaver_settings_summary_either_long, + R.string.screensaver_settings_summary_never }; @Test diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 21cb9f153fc03a50606923ecb65b1bf8960cc17f..d58d7e8d5f39b5fbb2a73c705648d06b8457e7b9 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -28,7 +28,6 @@ import android.widget.Button; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.widget.LayoutPreference; @@ -39,9 +38,10 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StartNowPreferenceControllerTest { private StartNowPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index 17c6cedab2b5666c617dd59a7aebbabee64e5689..5173b63197f034f7c3a9eb34e27fee28bd5a1aeb 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WhenToDreamPickerTest { private WhenToDreamPicker mPicker; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index e4f5cff1d76c05ca2477b011a158cf4aee3f69fe..acb2a80cbb28a8a0389368b7c5e752f962a12537 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.content.Context; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.WhenToDream; @@ -34,9 +33,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WhenToDreamPreferenceControllerTest { private WhenToDreamPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java index 8ab3b636d106b8964b83714ace94706c282d5cc0..c01ef3fa56ecd9043b8119db59b0ed5f00dc6e32 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java @@ -37,10 +37,8 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.testutils.CustomActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowActivity; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; -import com.android.settings.testutils.shadow.ShadowProcess; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -48,17 +46,18 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowProcess; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowDevicePolicyManager.class, ShadowUserManager.class, - ShadowActivity.class, - ShadowProcess.class + ShadowActivity.class }) public class ActionDisabledByAdminDialogHelperTest { private ActionDisabledByAdminDialogHelper mHelper; @@ -156,7 +155,7 @@ public class ActionDisabledByAdminDialogHelperTest { dpmShadow.setIsAdminActiveAsUser(true); userManagerShadow.addProfile(new UserInfo(123, null, 0)); userManagerShadow.addUserProfile(new UserHandle(123)); - ShadowProcess.setMyUid(Process.SYSTEM_UID); + ShadowProcess.setUid(Process.SYSTEM_UID); mHelper.setAdminSupportDetails(mActivity, view, admin); assertNotNull(admin.component); diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java index e016a06990ce7f745909f8a8db560fce11dd494c..75bd672b95594fa3594c8fedbfc09e1651e9678e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java @@ -16,20 +16,21 @@ package com.android.settings.enterprise; +import static org.junit.Assert.assertEquals; + import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Intent; import android.os.UserHandle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ActionDisabledByAdminDialogTest { private ActionDisabledByAdminDialog mDialog; @@ -48,7 +49,7 @@ public class ActionDisabledByAdminDialogTest { final Intent intent = new Intent(); intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, component); intent.putExtra(Intent.EXTRA_USER_ID, userId); - Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent)); + assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(intent)); } @Test @@ -56,7 +57,7 @@ public class ActionDisabledByAdminDialogTest { final int userId = UserHandle.myUserId(); final EnforcedAdmin expectedAdmin = new EnforcedAdmin(null, UserHandle.of(userId)); - Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null)); + assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null)); } @Test @@ -65,11 +66,11 @@ public class ActionDisabledByAdminDialogTest { final Intent intent = new Intent(); intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, restriction); - Assert.assertEquals(restriction, mDialog.getRestrictionFromIntent(intent)); + assertEquals(restriction, mDialog.getRestrictionFromIntent(intent)); } @Test public void testGetRestrictionFromNullIntent() { - Assert.assertEquals(null, mDialog.getRestrictionFromIntent(null)); + assertEquals(null, mDialog.getRestrictionFromIntent(null)); } } diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java index 26bc78783a8b8c167ad34a014cbfdb8239dba36e..8d5e4dad13dcac45dba07990cf32d76b46865ae5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java @@ -18,14 +18,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminActionPreferenceControllerBaseTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java index 82ec40e043401a0d42522ddd6401affc3de853e9..6982ba6b8549cbc374ab7b71c61d257079d3bae7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedCameraPermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java index 8f30e92968baf755382bc5a8d09981942410fcef..6328f53a2f87f6d18b00f280cadeec8a1dc38090 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedLocationPermissionsPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java index 1acbfdcb78dcb88b88b1cb0f49fd986fd038855a..d9275f6a1c2119ebce7f8e92c2f341b03eb1c57b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.Manifest; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedMicrophonePermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java index 854ccc86f511f46e3c3770d54a478cdbbcc0d982..49e098415fbcf0644cc2bafc5a16380411b2dfd0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java @@ -16,11 +16,10 @@ package com.android.settings.enterprise; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdminGrantedPermissionsPreferenceControllerBaseTest extends AdminGrantedPermissionsPreferenceControllerTestBase { @@ -47,4 +46,3 @@ public class AdminGrantedPermissionsPreferenceControllerBaseTest } } } - diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 2da6a88df74ac768761dd356f49414ab8abbaa58..6c136f1c0454c73f444e57736f82953f93e14881 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -18,8 +18,8 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 8c704fca781140f68e7c88ee2b58572b3fcc0358..2ff9d17afdd2e3d1acd03b82bb60ca044dd62df3 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 759edb3708721c722edaceb4db099f1347e10fa6..5a4f38bfc09b2c8573fdd13cc29485474c819b7f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 5c197926a2744cac4610dde1df99fd3c813b3e65..7bb8c61fda5195353921b5b71209e435b9a6bac2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -33,7 +33,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationListFragmentTest { private static final int USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 833efd4d3dd55ba57d2bbbc36be07f510b065fa6..298c37690f2cca45831c376aa9d5c1865b9650e6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -21,9 +21,9 @@ 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -41,7 +41,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.applications.UserAppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -49,6 +48,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; @@ -57,7 +57,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApplicationListPreferenceControllerTest { private static final int MAIN_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index 63c5981524bd8c01f3231408b1c371f590b2d941..5a05eccf6401d0c7051aede5a4af9e89c79bf5e7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BugReportsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 48bb0ce125e118b5bd86f20961020d5c230c7577..799dd7e360031c0a844719e4b47d666c5ea37145 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -23,13 +23,13 @@ import static org.mockito.Mockito.when; import androidx.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.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsCurrentUserPreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java index 2ba55ed0dad979d855848ed8a4d7c11db5f22177..b2f34cb32a7e7d82aaf6b62dc417652f4542e5e0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsManagedProfilePreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java index 16905eecade7910e6a22e3a138e959e25be15a8a..ea1edd6da76e0da9d8691815b8e954b66a29e6f6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase { private static final String PREF_KEY = "pref"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index ac3ee27d8f2c43ebd8e09513fa23c316108809ba..232d3e792c7f0a0cc21de1af69dd1f7493a4e654 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -30,7 +30,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,8 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseInstalledPackagesPreferenceControllerTest { private static final String KEY_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 92c420af96020ee6d580b1a1c2b021e98dfc3ad5..8cbaa76355faf18de04010b31a19de41c57dbf5e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -37,13 +37,13 @@ import android.provider.Settings; import android.text.SpannableStringBuilder; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; @@ -51,7 +51,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacyFeatureProviderImplTest { private final ComponentName OWNER = new ComponentName("dummy", "component"); diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index dc5794c85da36762841540f11a725a70bf467769..6858dd3391baa2561aec58228d74c9d6865d8d29 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacyPreferenceControllerTest { private static final String MANAGED_GENERIC = "managed by organization"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index f7a61c88cd93f1d56582410f2d506763621f2e1f..2d4ba6295e575a24f747948a4c01caf943d5ad10 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -25,7 +25,6 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.PreferenceCategoryController; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.drawer.CategoryKey; @@ -36,11 +35,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterprisePrivacySettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 54559688401c26d5fef0d36dd937494e5cfbea91..52954021a9bb6f1f620a0eaaf2eac7e5e8ca6682 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; @@ -36,11 +35,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListFragmentTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index 2b3ed738dd73e4b78ca18ce932beeec6d298fb85..7a2aa5cf962781855a898ba443ef4c15eb579f69 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -19,9 +19,9 @@ 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.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; import com.android.settings.testutils.ApplicationTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -52,13 +51,14 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListPreferenceControllerTest { private static final int USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index eabd4bb7b6c5b6c2ea1cffeeb92b8ea5835874e1..b91582bb9f8962716408f3c7ee3e0cfa1efa0308 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -19,9 +19,9 @@ package com.android.settings.enterprise; 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -36,7 +36,6 @@ import com.android.settings.R; import com.android.settings.applications.EnterpriseDefaultApps; import com.android.settings.applications.UserAppInfo; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -48,8 +47,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 25044c690829f13e28a75be682f1bfa459e0f8b0..a8c4abbd835f35145c610b534dcdf70836a3433c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FailedPasswordWipeCurrentUserPreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java index aed46bd21ff2b7efb2305216dc37650ee9e82ddb..d4536dcdca5a9025eae99b57caeb7a896e84a13e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java @@ -18,11 +18,10 @@ package com.android.settings.enterprise; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java index 83fbe6ced82d0ba83e3080ad9ca9629ecc7b521e..9d9b518898256b34b490774280f57f528adf1c06 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java @@ -16,11 +16,10 @@ package com.android.settings.enterprise; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FailedPasswordWipePreferenceControllerBaseTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 10e569a7a7e36abc8388310e2faecc9d36259b4c..05d1c640fd04427019e79af64320c83bcf9a1390 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 d62576065f511587f6bbd63603c020852e0cc8b6..facdce5d0c9335e2d626fdaac0fb65fdd17e0815 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -26,7 +26,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -34,8 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImePreferenceControllerTest { private static final String DEFAULT_IME_LABEL = "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 661585326a16a7ca1a5d8492c04a3e5655b103d5..492a8639c7cc0c54c428c54970372714cd640081 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -28,17 +28,17 @@ import androidx.preference.Preference; import com.android.settings.R; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageDeviceAdminPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 56d90f56c76db6f9681c1e49f556c0016ca9e75c..89c208c89f0126fae157220a5a6f42e71404107d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { @Override diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 00eb3f964876a75da4841fccff7c5333b557d361..8612ee79bf8444b1ed7c86e044a00f67cf1b9d83 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -20,14 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Date; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { @Override diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java index 4af57545642228e19bd61f317161b7402c609605..fe7a6854c3fe0dd1c679d26a9771c1f771de669a 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java @@ -30,18 +30,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FlashlightSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index c9086abf7737d6f1c34766b9e1623bf9c6315639..8eeac8d26b041534072e87b6a861d2170bf42e31 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -20,11 +20,11 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENT 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.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -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.doReturn; import static org.mockito.Mockito.mock; @@ -52,7 +52,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowActivityManager; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; @@ -71,11 +70,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class}) public class AdvancedPowerUsageDetailTest { private static final String APP_LABEL = "app label"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index fcd483a808294e419605c54df78064a193c1e409..0b6051b7ee1d17ff5e40c50fc845369bee7b0aaa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -27,15 +27,15 @@ import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoRestrictionPreferenceControllerTest { private static final int ON = 1; private static final int OFF = 0; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index 6b52b650879c9bba131a1b7fa4b9fd9472405d56..75b38a0bdfe1975b5dd64a547db01aad32f8f297 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -38,8 +38,6 @@ import android.os.UserManager; import com.android.settings.R; 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.ShadowFragment; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -50,11 +48,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowFragment.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowFragment.class) public class BackgroundActivityPreferenceControllerTest { private static final int UID_LOW_SDK = 1234; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index 2ef359b93788d8d99d512737a983052b5786c5bc..e1913a2d304675cfa3727cb71026224efccdaafe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -34,16 +34,16 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryAppListPreferenceControllerTest { private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"}; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 02a6761e6941eb31eda42f0c4e0897f2471a92d7..cdbbf7e23a4165374a2aa1840a4208ccb7021be7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -19,8 +19,8 @@ import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpd import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -34,21 +34,18 @@ import android.os.PowerManager; import com.android.settings.Utils; import com.android.settings.homepage.contextualcards.slices.BatteryFixSliceTest; -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.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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryBroadcastReceiverTest { private static final String BATTERY_INIT_LEVEL = "100%"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java index 41e77e9a8b0a297088aba24c80b421b23b88c5eb..eac5525d1aaa101efceadfa9e6a0a0a14479b195 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java @@ -28,19 +28,19 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.testutils.DatabaseTestUtils; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryDatabaseManagerTest { private static String PACKAGE_NAME_NEW = "com.android.app1"; private static int UID_NEW = 345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java index 7bb08485b5fd45c10ae8e7b2f270a421fcdff549..fceee7ef67adb4d11ec3bcbb366f2eefc36d3acd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java @@ -31,7 +31,6 @@ import android.os.UserManager; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Rule; @@ -40,11 +39,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryEntryTest { private static final int APP_UID = 123; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 7797a786e57bab325533986d512bc7ecb5beb84e..b22821b7c69e0a0b22b5068e892c17cf9fc789f2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -21,9 +21,9 @@ import static androidx.lifecycle.Lifecycle.Event.ON_START; 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.nullable; -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; @@ -43,9 +43,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -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.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -57,18 +54,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowEntityHeaderController.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowEntityHeaderController.class) public class BatteryHeaderPreferenceControllerTest { private static final String PREF_KEY = "battery_header"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 75f316f90a7592192f63a3743e33b483be566060..fc8e99472bbed191002b91e582b8176985d10712 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -17,8 +17,8 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +31,6 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.UsageView; import org.junit.Before; @@ -40,11 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class BatteryHistoryPreferenceTest { private static final String TEST_STRING = "test"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index dc5834ee9c0e3a55fc6e3e91eb7a20493b1ed888..6593767a44df02fdcaa9bdaf89bc42136bd8314b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -18,8 +18,8 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -31,7 +31,6 @@ import android.os.BatteryStats; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryInfoLoaderTest { private static final long TEST_TIME_REMAINING = 1000L; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index ccc86a29fcfa9bd7b3898729a2da87c755cb6968..01030315901e6af295d72e4f465aefa0be1214c5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -19,7 +19,7 @@ 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.ArgumentMatchers.anyLong; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -39,7 +39,6 @@ import android.util.SparseIntArray; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.UsageView; import com.android.settingslib.R; @@ -52,12 +51,13 @@ 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.RuntimeEnvironment; import java.time.Duration; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryInfoTest { private static final String STATUS_CHARGING_NO_TIME = "50% - charging"; @@ -71,7 +71,7 @@ public class BatteryInfoTest { "1 min left until fully charged"; private static final String TEST_BATTERY_LEVEL_10 = "10%"; private static final String FIFTEEN_MIN_FORMATTED = "15 min"; - public static final Estimate DUMMY_ESTIMATE = new Estimate( + private static final Estimate DUMMY_ESTIMATE = new Estimate( 1000, /* estimateMillis */ false, /* isBasedOnUsage */ 1000 /* averageDischargeTime */); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index 364a63a33e401cc28a9b452b760d6cb779217161..4bdcd5535b365b243880d8cf1a3db4d2bfeee8a6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -24,20 +24,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.ColorFilter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResources.class, SettingsShadowTheme.class}) +@RunWith(RobolectricTestRunner.class) public class BatteryMeterViewTest { private static final int BATTERY_LEVEL = 100; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index afbb5b6c1763cd788b229e32cd15d43ee37fa357..329a70dcd796c4917d394e4f5c9ae7644814a3e6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -33,7 +33,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryOptimizationPreferenceControllerTest { private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 7e887848c116fe064e1b82ba33930c6909500397..db9ffa5c7a02c0d84c2f8ad50497ca7f31cefeb7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -27,17 +27,16 @@ import android.provider.Settings; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java index c57c522afea5658df66560b2782ea667ff333c40..ec6436a4391caac6fa7d879c5ed28c9375c3d46d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java @@ -22,15 +22,14 @@ import android.content.Intent; import android.os.BatteryManager; import android.os.PowerManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverReceiverTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java index 8d1302ff7e83a2ebb8987382f407c695857b2a9c..92a3dc0110cb18a40c7c0b168b8e6cc3de1ea4c3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,16 +25,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.ConnectivityManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryStatsHelperLoaderTest { @Mock private BatteryUtils mBatteryUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 4cb7ff58b03ae153a0d06cbc7d6b934b07593e22..7c455bbdd7b64056510da4b9d8c4309ff20bd53d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -23,10 +23,10 @@ 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -57,7 +57,6 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -67,12 +66,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryUtilsTest { // unit that used to converted ms to us diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java index 1817325e15acf6abf6c83d9b3efa9da3d23feeef..5716b2743e472613c15b9245e55fb03248b7b2ee 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java @@ -16,8 +16,8 @@ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,7 +28,6 @@ import android.content.DialogInterface; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; @@ -36,9 +35,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighPowerDetailTest { private static final int TEST_UID = 12000; private static final String TEST_PACKAGE = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index 140a426b7e84008bb3fd013a681cb3d58f0a1e43..10b89a62290dcbc449ca8a4e6bf9ce6febebcc3c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -28,15 +28,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerGaugePreferenceTest { private static final String SUBTITLE = "Summary"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 2f3cb7cf2a43c4455ede03e13fd8a09d146ada93..1ef288016b42ca5f865579f18a351017a97e3df8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -17,9 +17,9 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -45,9 +44,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerUsageAdvancedTest { @Mock private PreferenceScreen mPreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java index 012ebb2638c520d34ecece8dcf3a8e5b01c2c8e1..cd1b1780d2c6c81310e5407d8c0fa28581c5623f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java @@ -15,8 +15,8 @@ */ package com.android.settings.fuelgauge; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -28,7 +28,6 @@ import android.os.Bundle; import androidx.loader.app.LoaderManager; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; @@ -37,11 +36,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDashboardFragment.class) public class PowerUsageBaseTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 6d18109fb10c3e96538bf99ee8bdda48f7956369..e8a9c5cb05a6b374871f08a83c6f273eeaab2f28 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -25,7 +25,6 @@ import android.content.pm.PackageManager; import android.os.Process; import com.android.internal.os.BatterySipper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerUsageFeatureProviderImplTest { private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 14caf2c8187612296b39750869259d129049bc8a..2ee6d0c95882ea73f1aaafb8cb2f9977c193d27d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -19,10 +19,10 @@ import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BAT 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -50,9 +50,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; 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.settingslib.widget.LayoutPreference; import org.junit.Before; @@ -66,18 +64,14 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; // TODO: Improve this test class so that it starts up the real activity and fragment. -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class, -}) +@RunWith(RobolectricTestRunner.class) public class PowerUsageSummaryTest { private static final int UID = 123; @@ -115,8 +109,6 @@ public class PowerUsageSummaryTest { private SettingsActivity mSettingsActivity; @Mock private LoaderManager mLoaderManager; - @Mock - private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Menu mMenu; @Mock @@ -240,14 +232,14 @@ public class PowerUsageSummaryTest { .thenReturn(true); doAnswer(new Answer() { @Override - public Object answer(InvocationOnMock invocation) throws Throwable { + public Object answer(InvocationOnMock invocation) { 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 { + public Object answer(InvocationOnMock invocation) { return mRealContext.getString( R.string.power_usage_enhanced_debug, invocation.getArguments()[0]); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 0d3a391e666d8010774200d4bb8c88c6ec5984df..3746d648ff4385d7b49e9c9267a82891f6755cb9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RE import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,7 +38,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -50,8 +49,9 @@ import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppPreferenceControllerTest { private static final int ALLOWED_UID = 111; private static final String ALLOWED_PACKAGE_NAME = "com.android.allowed.package"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index e5a4b3d2e06059b86720a54db97933dbd4d2ece6..2991e780fa0f5099a8a54b43eb1a04e8667026e8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -46,8 +46,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipDialogFragment; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Before; @@ -56,6 +54,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; @@ -64,8 +63,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class RestrictedAppDetailsTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 96b1d7d810f16aa7cd76677035dc8fa7e80f862b..7bc6ead2e808abe4dbb7d120cfba56a120a06cf0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -21,22 +21,21 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; -import android.content.Context; import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryPreferenceControllerTest { private static final int ON = 1; @@ -45,10 +44,8 @@ public class SmartBatteryPreferenceControllerTest { private SmartBatteryPreferenceController mController; private SwitchPreference mPreference; private ContentResolver mContentResolver; - private Context mContext; private FakeFeatureFactory mFeatureFactory; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -120,7 +117,7 @@ public class SmartBatteryPreferenceControllerTest { @Test public void isSliceableCorrectKey_returnsTrue() { final SmartBatteryPreferenceController controller = - new SmartBatteryPreferenceController(mContext); + new SmartBatteryPreferenceController(null); assertThat(controller.isSliceable()).isTrue(); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index b1bc074eb50feff72b2b164005fb8ee08cddd29b..e6efef7cc12e6b3480accb2bf0b37c50d350c058 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -22,14 +22,13 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelBatteryPreferenceControllerTest { private Context mContext; @@ -43,11 +42,9 @@ public class TopLevelBatteryPreferenceControllerTest { public void getDashboardLabel_returnsCorrectLabel() { BatteryInfo info = new BatteryInfo(); info.batteryPercentString = "3%"; - assertThat(getDashboardLabel(mContext, info)) - .isEqualTo(info.batteryPercentString); + assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString); info.remainingLabel = "Phone will shut down soon"; - assertThat(getDashboardLabel(mContext, info)) - .isEqualTo("3% - Phone will shut down soon"); + assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon"); } } 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 2bc5b14dd3fe7d17bd4b17efffea10191d3ad779..df1d9094e2ef4a7ab480429a9c171392720d33dc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -24,18 +24,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -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; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class AutoBatterySaverPreferenceControllerTest { private AutoBatterySaverPreferenceController mController; 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 5d2ac62c3b624d23706cb169f38273ad1f1a2e25..c13b9139994b5e04900778636e54551572e8f4b9 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -22,8 +22,6 @@ import android.provider.Settings; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -31,15 +29,13 @@ 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(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class AutoBatterySeekBarPreferenceControllerTest { private static final int TRIGGER_LEVEL = 20; - private static final int DEFAULT_LEVEL = 15; private static final int INTERVAL = 5; private AutoBatterySeekBarPreferenceController mController; @@ -54,8 +50,6 @@ public class AutoBatterySeekBarPreferenceControllerTest { mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); - SettingsShadowResources.overrideResource( - com.android.internal.R.integer.config_lowBatteryWarningLevel, DEFAULT_LEVEL); mContext = RuntimeEnvironment.application; mPreference = new SeekBarPreference(mContext); mPreference.setMax(100); @@ -90,7 +84,6 @@ public class AutoBatterySeekBarPreferenceControllerTest { assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL / INTERVAL); } - @Test public void testOnPreferenceChange_updateValue() { Settings.Global.putInt(mContext.getContentResolver(), 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 051ef399325ce644a832b6e3263b7ed26e7529fe..7999dc8eb37456604856e69640b158b04581dbb2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.widget.Button; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; import org.junit.Before; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverButtonPreferenceControllerTest { private BatterySaverButtonPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java index c4d4c87b62558b70ecb56933fbbef58f3dfdba5b..d1d21f3866414e4fd676dadecc2d040f7b45c70d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSchedulePreferenceControllerTest.java @@ -21,18 +21,20 @@ import android.content.Context; import android.os.PowerManager; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.Preference; -import com.android.settings.R; -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; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class BatterySaverSchedulePreferenceControllerTest { 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 7bcfd369d04ccf525e25165f4c79363215112a87..32ea9e026a5c39d06bf4f60197c4ab681795b398 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java @@ -34,7 +34,6 @@ import android.content.Context; import com.android.settings.R; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import org.junit.After; @@ -44,13 +43,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class AnomalyCleanupJobServiceTest { private static final int UID = 1234; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 13be36616ac2ddf7052b38c29408bb9da12713ef..30cab77f6bc5b28a3303f54a7603a69672f35528 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -19,10 +19,10 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -37,19 +37,19 @@ import android.content.Context; import android.provider.Settings; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnomalyConfigJobServiceTest { private static final int ANOMALY_CONFIG_VERSION = 1; @@ -124,5 +124,4 @@ public class AnomalyConfigJobServiceTest { verify(mStatsManager).addConfig(eq(StatsManagerConfig.ANOMALY_CONFIG_KEY), any()); } - } 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 5f32c0b121b76604c07a578d11abe1ea25e6fa52..ba67793cc059ec0a62f08ceb585c8c362e29a4b0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -55,7 +55,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; @@ -66,6 +65,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ServiceController; import org.robolectric.annotation.Config; @@ -74,7 +74,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowPowerWhitelistBackend.class}) public class AnomalyDetectionJobServiceTest { private static final int UID = 12345; 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 ef12673ace7d0e501046e28d794845e859686687..ad546f38a42993d1e20f5f42343b89f3b97ee4ef 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java @@ -21,8 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; import android.text.format.DateUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,8 +28,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppInfoTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 4097e7cf6c4f97a176ad9558008c0cced4de57cd..435aa8874fc68799e0c3f1bfd9b1b29bd07f1adc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -27,16 +27,16 @@ import android.provider.Settings; import androidx.preference.Preference; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryManagerPreferenceControllerTest { private static final int ON = 1; private static final int OFF = 0; 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 bd4f899881e7d8275c6516dafaada61041509228..e91190224e1f3382cb70d1f99409c09579697662 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -35,8 +35,6 @@ import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -45,6 +43,7 @@ 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.shadows.androidx.fragment.FragmentController; @@ -52,9 +51,8 @@ import org.robolectric.shadows.androidx.fragment.FragmentController; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class BatteryTipDialogFragmentTest { private static final String PACKAGE_NAME = "com.android.app"; 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 3485113ad8fe231263e1d1064408fd153df6b0d0..2f5fa1ae577511b173457f7a10c24bf081198224 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -18,7 +18,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -33,7 +33,6 @@ import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate; import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.testutils.BatteryTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -42,11 +41,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipLoaderTest { private static final int[] TIP_ORDER = { @@ -84,8 +85,8 @@ public class BatteryTipLoaderTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @Test 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 053a7164345c5d4e3d3db18234498d4cb1d5c6aa..9b54fc77f2e8e9b119e70ae9097c603c8ae64b3c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java @@ -22,14 +22,13 @@ import android.content.Context; import android.provider.Settings; import android.text.format.DateUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipPolicyTest { private static final String BATTERY_TIP_CONSTANTS_VALUE = "battery_tip_enabled=true" 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 afa8e4ec3ba08450c53c3713599cdf9fb1553071..5d45045c038ac082e7b66ab0ddeab60c7a13eddf 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -44,7 +44,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipPreferenceControllerTest { private static final String KEY_PREF = "battery_tip"; 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 3882e8c0e85ad8ec72534728f49daed2c38d86a1..3b024ebfb7287056d7111d0af53d980253eeeb32 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java @@ -33,18 +33,18 @@ import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipUtilsTest { @Mock 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 3569d7d8476063bd82f4c9369bfe8dad0d8c3441..a0e205d4d0d5e71b4c220ae0ceed4b22b4645fdc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.os.BatteryStats; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import java.time.Duration; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageDataParserTest { private static final long PERIOD_ONE_MINUTE_MS = Duration.ofMinutes(1).toMillis(); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java index 55ab113163ba65002914b95c72182fa6361ceb36..a03c50a5d7b3ca28581a67dd19dcdc22d537f5f2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java @@ -30,7 +30,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -42,8 +41,9 @@ import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OpenRestrictAppFragmentActionTest { private static final String PACKAGE_NAME_1 = "com.android.app1"; 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 86c6714ef83723ea777ebfef759347bc0a14d15e..8f14d23256c983c585a300f01479220657943222 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 @@ -27,7 +27,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,12 +34,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppActionTest { private static final int UID_1 = 12345; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java index f57284a05e9374de019dcae7eb32ffa07a799dff..1ef9a8a8c3000755b59dcdd563c0102db10e25c0 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -27,7 +27,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UnrestrictAppActionTest { private static final int UID_1 = 12345; 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 24284efdd2207324c873f35543c2440cc19cc4b2..dbee7f1e6adc22f9e3f118d5c06a1621b9f33d1a 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 @@ -18,7 +18,7 @@ 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.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -30,17 +30,17 @@ import android.os.PowerManager; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EarlyWarningDetectorTest { private Context mContext; 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 379d28f1e6cc4cbf0d8fd90d57f235b39bd9b390..7b9e5a5c73a42ec3ad9c69790f7d68ba89517014 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 @@ -36,20 +36,20 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.HighUsageDataParser; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageDetectorTest { private static final int UID_HIGH = 123; private static final int UID_ZERO = 345; 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 657a5e326b084193ca0f7436d635956727907b40..55020e2281b68abafde63e870f1c724e736091b3 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 @@ -26,13 +26,13 @@ import android.os.PowerManager; import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPowerManager; @@ -40,7 +40,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.TimeUnit; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowBatteryDetectorTest { @Mock @@ -94,8 +94,7 @@ public class LowBatteryDetectorTest { public void testDetect_batterySaverOn_tipHandled() { mShadowPowerManager.setIsPowerSaveMode(true); - assertThat(mLowBatteryDetector.detect().getState()) - .isEqualTo(BatteryTip.StateType.HANDLED); + assertThat(mLowBatteryDetector.detect().getState()).isEqualTo(BatteryTip.StateType.HANDLED); } @Test 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 0133ecfd0ee7dd5135aed8d8058d1055011fda1c..f68a0b47c3f867de639652b8021f4469451dc00e 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 @@ -18,10 +18,10 @@ 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.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.spy; @@ -41,7 +41,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.DatabaseTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -49,12 +48,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppDetectorTest { private static final int RESTRICTED_UID = 222; @@ -82,9 +83,7 @@ public class RestrictAppDetectorTest { MockitoAnnotations.initMocks(this); mAppInfoList = new ArrayList<>(); - mAppInfo = new AppInfo.Builder() - .setPackageName(PACKAGE_NAME) - .build(); + mAppInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME).build(); mAppInfoList.add(mAppInfo); mContext = spy(RuntimeEnvironment.application); @@ -112,8 +111,8 @@ public class RestrictAppDetectorTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @After 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 f10ea7ee601c1878017df42519fcf53849fdf3cb..477bf49f7f712be1f3c1c4de0017df2d462fc3cb 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 @@ -26,16 +26,16 @@ import android.provider.Settings; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryDetectorTest { private Context mContext; 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 27cb04b30721c90db8d2677f70d77c27982cb0c7..0fd3ccfa03c7d63c8f18e46cb8c98503e997ab31 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 @@ -23,16 +23,16 @@ import static org.mockito.Mockito.spy; import android.text.format.DateUtils; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryDetectorTest { private BatteryTipPolicy mPolicy; 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 1c8bfdb97efc5e1417ed868ac94af4220285ed14..3e18bf06d620e00eb3845f9bb55a71085af50dd3 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 @@ -25,19 +25,19 @@ import androidx.annotation.IdRes; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryTipTest { private static final String TITLE = "title"; 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 752e3aba58bfe0a89f6cc1bb3351d6284d53539e..7a447d90534419e638dbbf0d08520b0787839c94 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 @@ -24,7 +24,6 @@ import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EarlyWarningTipTest { @Mock 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 1ff21f8c9ef757daadef09ebc4f4baae32814d06..ffe8b200f4fecedce9cf59084de57adbf91bd2eb 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 @@ -25,7 +25,6 @@ import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -33,12 +32,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighUsageTipTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index fe721133aea24a9ed1c2b40fae51c012dd19efb7..11dffcdcbcbd826ae83cbf520b033671f316bb21 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -23,7 +23,6 @@ import android.content.Context; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -31,9 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowBatteryTipTest { private static final CharSequence SUMMARY = "Only 15 minutes left"; 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 d4a10bce4764c3ad7889fc517fdcf42900644490..b95040a7bd2841d217c63ac157038544a68cdda2 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 @@ -17,8 +17,8 @@ package com.android.settings.fuelgauge.batterytip.tips; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; @@ -35,7 +35,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.BatteryTestUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.After; @@ -44,12 +43,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RestrictAppTipTest { private static final String PACKAGE_NAME = "com.android.app"; private static final String UNINSTALL_PACKAGE_NAME = "com.android.app.unintall"; @@ -104,8 +105,8 @@ public class RestrictAppTipTest { @After public void tearDown() { - BatteryTestUtils.clearStaticInstance(AppLabelPredicate.class, "sInstance"); - BatteryTestUtils.clearStaticInstance(AppRestrictionPredicate.class, "sInstance"); + ReflectionHelpers.setStaticField(AppLabelPredicate.class, "sInstance", null); + ReflectionHelpers.setStaticField(AppRestrictionPredicate.class, "sInstance", null); } @Test @@ -246,6 +247,5 @@ public class RestrictAppTipTest { MetricsProto.MetricsEvent.ACTION_APP_RESTRICTION_TIP, BatteryTip.StateType.HANDLED); verify(mMetricsFeatureProvider, never()).action( anyInt(), anyInt(), anyInt(), anyString(), anyInt()); - } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java index 1e4aef8fa66354ad73fbbeef31f1bb7139d4ba3d..7da6a4ffc3f6ced7ba63ce95a1dae60ce97e99a3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTipTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -28,9 +27,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SmartBatteryTipTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java index 221c37fcbc7201bea8096d671e2ee3b4bdfae4f8..f751b290fd9d22a06948838cf128e8c1b72ab8bf 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java @@ -24,7 +24,6 @@ import android.os.Parcel; import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryTipTest { private static final long AVERAGE_TIME_MS = DateUtils.HOUR_IN_MILLIS; @@ -49,8 +49,7 @@ public class SummaryTipTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mSummaryTip = - new SummaryTip(BatteryTip.StateType.NEW, AVERAGE_TIME_MS); + mSummaryTip = new SummaryTip(BatteryTip.StateType.NEW, AVERAGE_TIME_MS); } @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 f3e973599e984f57e5eb96d11d478fb89ac9d264..5688045503044e3bf675340b589e3cdaa3005d84 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 @@ -20,14 +20,14 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Parcel; import com.android.settings.fuelgauge.batterytip.AppInfo; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UnrestrictAppTipTest { private static final String PACKAGE_NAME = "com.android.app"; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index 59696abe0b3ea7027ea21f5543e49b0ecb14209e..e77521dfcee323ea4c5e60b416df333f114db920 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; @@ -32,9 +31,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AssistGestureSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9946361baffa53aefa6e8223cbdf7b3dcefc1220..d6c6a1f8f5fba22f9d5160fa39cef0003ea663b5 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import android.content.Context; @@ -26,17 +26,17 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AssistGestureSettingsTest { private FakeFeatureFactory mFakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 20bf4e6af148c2f22225616a3a7a20efa66a36b9..fac5ae8102265dd7a237d526c04b73ac21845048 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -30,17 +30,17 @@ import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class DoubleTapPowerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java index 5f7ee65db0eb5f267b1a89cf27c44f8fd43002e3..a08b81800a4d8135ce39dce5dcf8531d2654d064 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapPowerSettingsTest { private DoubleTapPowerSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 39792b49021ab15f90aa0586570c391f6fcbff3e..52cb75d8fe393b83da7e86b86126947abdc2ed78 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,7 +29,6 @@ import android.content.SharedPreferences; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapScreenPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -114,7 +114,6 @@ public class DoubleTapScreenPreferenceControllerTest { final int availabilityStatus = mController.getAvailabilityStatus(); assertThat(availabilityStatus).isEqualTo(AVAILABLE); - } @Test diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java index 0f14073687a07d19a6e10a9b017fe3b7a094d6c2..1a006422a10578b3ae672e7db4d9be38317c53dc 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTapScreenSettingsTest { private DoubleTapScreenSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java index 66fbbc9acfa374109786ccd9af45b88bd078711f..0981e2f7e904cb9eff870ccde3bfa990402cf07a 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DoubleTwistGestureSettingsTest { private DoubleTwistGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index ae97336da3a213e881d6f9ea47f2c968052074d0..0efbf574165b8ffb1c84ce8c080ef1af010a15d6 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.os.UserManager; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController; @@ -41,13 +40,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class DoubleTwistPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 7d1eab37864206b11d2ed6419a5693af7568749f..32be603db65270307ffbc2cfa3664dc3b18bff2d 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; @@ -31,7 +31,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.VideoPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GesturePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -196,8 +196,7 @@ public class GesturePreferenceControllerTest { boolean mIsPrefAvailable; boolean mIsPrefEnabled; - private TestPrefController(Context context, - String key) { + private TestPrefController(Context context, String key) { super(context, key); } diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java index db8064ae3ac533d40db2e542ef449a408dc4665d..54525a44260ac7feb178bffaf0136aa4bb3bdbb8 100644 --- a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java @@ -18,13 +18,13 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GestureSettingsTest { @Test diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index e892eb2bb46a66a0bfdf74ba9f1265c9ad70c3cc..1e842078b4711cd66396d41a6073a3b35696493d 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.AbstractPreferenceController; @@ -43,6 +42,7 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -50,7 +50,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GesturesSettingsPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index e889d41bd2100d0bdf56e127f10bc1301e6aea18..5422eabc053027a95897edd5fd4a97171a4c693e 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -21,7 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,7 +29,6 @@ import android.content.SharedPreferences; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PickupGesturePreferenceControllerTest { private static final String KEY_PICK_UP = "gesture_pick_up"; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java index 72865cfd4e2efb0275f7ab949601cff8579c5273..2d44b3925ccb2ce58d382bc9e2e8b2b73b532bf6 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PickupGestureSettingsTest { private PickupGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java index 6d77d772c719b4d4f0e9817e8c01121bc844d5c4..84fef5d15c494495a3dd773cb78bdaec53e988e1 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGesturePreferenceControllerTest.java @@ -31,17 +31,15 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingGesturePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java index 47bb4706838321af9ffd5734519eb53a3f8466f9..d8563e272d4f82360457bf8a3299d8af50b483f2 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingGestureSettingsTest { private PreventRingingGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index 9e83e052cea1ea73e143ac9491fdc3886bf904e7..07716859a197b2db265242a5a53feb1539991e69 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java @@ -33,16 +33,16 @@ import android.content.res.Resources; import android.provider.Settings; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreventRingingParentPreferenceControllerTest { @Mock @@ -50,9 +50,6 @@ public class PreventRingingParentPreferenceControllerTest { private Context mContext; private PreventRingingParentPreferenceController mController; - private final String VIBRATE_SUMMARY = "On (vibrate)"; - private final String MUTE_SUMMARY = "On (mute)"; - private final String NONE_SUMMARY = "Off"; @Before public void setUp() { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index b2816b52bcdd4b19f4eb5db3996dc390ae580ff9..dbef598d95b2f67b3ed16b77780a9e395ebda2c1 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.hardware.fingerprint.FingerprintManager; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwipeToNotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index de7b73c810f779d7f7f82c80db279f5bee485d61..40dc428760059d0fda0f868b7ffa4a10623120ae 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -22,19 +22,19 @@ import android.content.Context; import android.provider.SearchIndexableResource; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwipeToNotificationSettingsTest { private Context mContext; @@ -78,5 +78,4 @@ public class SwipeToNotificationSettingsTest { assertThat(niks).isNotEmpty(); } - } diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java index 1ce6d0a67bd7d62afc7cd6fb83289695acb90664..e98bdc84caae3c78be8c5df3a88123a1f892473e 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java @@ -26,19 +26,19 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import com.android.internal.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class SwipeUpPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java index c6249fb74ee20d7acfc0c54dfff7da51f02a9729..10a3d90861175ab6fdfd11686b46936ddb00055d 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java @@ -21,13 +21,12 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,8 +34,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeLockScreenGesturePreferenceControllerTest { private static final String KEY_WAKE_LOCK_SCREEN = "gesture_wake_lock_screen"; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java index 0cd777d307d76ce2ce246dc26728085968ea1af2..686a0fff62875f3076cecbadbc7cb280391b4533 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeLockScreenGestureSettingsTest { private WakeLockScreenGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java index 0af45408323485e99205b2ca59f89dbadcfd7d85..ebc0f27f7caca907f3a5fb452c29ae2f8436d367 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java @@ -21,13 +21,12 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -35,8 +34,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeScreenGesturePreferenceControllerTest { private static final String KEY_WAKE_SCREEN = "gesture_wake_screen"; diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java index 1d7e225aab2ea415e32036d58d8ff6407eb49525..f1d2fcc12d0708053ba77c751d8f68f5b5d8e058 100644 --- a/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WakeScreenGestureSettingsTest { private WakeScreenGestureSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java index f1228194d4921070cbadf491db25bddf9c6a1f1b..1af8c32f0902036a34e68c0aca1e434b9a58dba9 100644 --- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java +++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java @@ -22,16 +22,16 @@ import android.util.FeatureFlagUtils; import com.android.settings.SettingsActivity; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsHomepageActivityTest { @Test diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java index 83ab948935ec7e0e4a45a187e61e8d9a33b53e58..5a6ca86aa1822eb0dc8a99d78da82654ffe2a56a 100644 --- a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java +++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java @@ -23,14 +23,13 @@ import static org.mockito.Mockito.when; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelSettingsTest { private Context mContext; private TopLevelSettings mSettings; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java index 1e444bb2e4f1de6d24eccab859c9a70f32c5a6a4..5bdb8d3ff5f6950fc512bacaf8d1d5966d5b518e 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java @@ -29,7 +29,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Build; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import org.junit.After; @@ -37,11 +36,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class CardContentProviderTest { @@ -97,7 +97,7 @@ public class CardContentProviderTest { @Test(expected = UnsupportedOperationException.class) public void cardData_delete() { - final int delCount = mResolver.delete(mUri, null, null); + mResolver.delete(mUri, null, null); } @Test(expected = UnsupportedOperationException.class) @@ -109,7 +109,7 @@ public class CardContentProviderTest { values.put(CardDatabaseHelper.CardColumns.SCORE, updatingScore); final String strWhere = CardDatabaseHelper.CardColumns.NAME + "=?"; final String[] selectionArgs = {"auto_rotate"}; - final int updateCount = mResolver.update(mUri, values, strWhere, selectionArgs); + mResolver.update(mUri, values, strWhere, selectionArgs); } @Test diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java index ef60f85ff6282602b8473a4ce6f1abd538438720..36e4f047c6146946258c9b21186b4150b3985373 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java @@ -24,18 +24,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import com.android.settings.intelligence.ContextualCardProto; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CardDatabaseHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java index b3f941147766e30c11d184bce8d59a739b8e6775..f1bb3ed4d494f56de867fad2003defa66ed45808 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImplTest.java @@ -18,8 +18,7 @@ package com.android.settings.homepage.contextualcards; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,18 +29,18 @@ import android.net.Uri; import android.os.UserHandle; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; -import com.android.settings.testutils.SettingsRobolectricTestRunner; 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; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardFeatureProviderImplTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java index 98943a0e07cdce38b2f8e9da2600901abe6f86b7..d86b9a31800b1e13d2021dc521aff5ed67d8072a 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java @@ -29,11 +29,11 @@ import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.SettingsSliceProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardLoaderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java index 4724500a294abea6771d9ede2ad7fd3e87bd36ef..eb558d817ebc2f040acc53eab497a91d7a28e336 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCardLookupTable .ControllerRendererMapping; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; import org.junit.Before; @@ -29,8 +28,9 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardLookupTableTest { private static final int UNSUPPORTED_CARD_TYPE = -99999; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java index 81f87b98d81710c040ec730af8aedcf2b5412981..2af84f96ca811e429e21c05907a0f7e173280508 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java @@ -32,20 +32,20 @@ import android.util.ArrayMap; import com.android.settings.homepage.contextualcards.conditional.ConditionFooterContextualCard; import com.android.settings.homepage.contextualcards.conditional.ConditionHeaderContextualCard; import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ContextualCardManagerTest { private static final String TEST_SLICE_URI = "context://test/test"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java index e51169e397247fbea0d8f758e2e5bdd7b66698c3..bf7c5e08e0cfbbcdcbec115c27b981df5561bf40 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ControllerRendererPoolTest.java @@ -22,15 +22,15 @@ import android.content.Context; import androidx.lifecycle.LifecycleOwner; -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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ControllerRendererPoolTest { private static final int UNSUPPORTED_CARD_TYPE = -99999; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java index 4b0b0851a9f409ae6047ee3fb8969b381723f7b2..8f36ea59652259273c5cfff9d9877767db31c715 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java @@ -29,7 +29,6 @@ import android.os.Bundle; import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsContextualCardProviderTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java index d27e0242851c5b252c6e6a422abfd7d9111e54a9..5d5070bca046340c004444c4f23eb65e55ed6d1f 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java @@ -24,16 +24,16 @@ import android.content.Intent; import android.media.AudioManager; import com.android.settings.homepage.contextualcards.ContextualCard; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AbnormalRingerConditionControllerBaseTest { @Mock @@ -66,7 +66,7 @@ public class AbnormalRingerConditionControllerBaseTest { private static class TestCondition extends AbnormalRingerConditionController { - public TestCondition(Context appContext, ConditionManager conditionManager) { + private TestCondition(Context appContext, ConditionManager conditionManager) { super(appContext, conditionManager); } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java index a962bc195693e151b706dac0b6bbaf2b7d10aaca..aa4e11f8e640b7e04bd634e072d13f00e6a68b59 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.net.NetworkPolicyManager; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BackgroundDataConditionControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java index d28ab0f9598d3b96fdb8af22da7fceeb49c5c166..e4ca6c097225d9e4fe549815d6ae35d277015c2a 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java @@ -27,18 +27,18 @@ import android.content.IntentFilter; import android.os.PowerManager; import com.android.settings.fuelgauge.BatterySaverReceiver; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPowerManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySaverConditionControllerTest { @Mock private ConditionManager mConditionManager; @@ -83,5 +83,4 @@ public class BatterySaverConditionControllerTest { assertThat(mController.isDisplayable()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java index 688e94cb5504594eaf4c227695d9f61dcaeb9762..566ca07a46ceca2204631d65b04e5296f7f00eda 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java @@ -29,13 +29,13 @@ import android.content.Context; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCard.CardType; import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionContextualCardControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java index 25689e6c988e22f7b135438461f467b5ae26abb2..c9b62aeba6609bc20413d45d15023a35e97c3f67 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java @@ -32,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java index 524a69091da0df0e82968a1e7262c6075621a7ab..fcb16f2cc13086ac4e0308d643a8f94a4ec3aea5 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardRendererTest.java @@ -31,16 +31,16 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionFooterContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java index 783ae9f1e7ae87cf14486b22689f2a04e8f61b3f..b658822ecaa60dd402c54b8b599644414fc2f371 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java @@ -19,12 +19,12 @@ package com.android.settings.homepage.contextualcards.conditional; import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionFooterContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java index ee8a582974b1f34be5b5cf950f207a022f45bee0..a4aa1d7eedab545b4c24eb156ae66a40ceec0eb6 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRendererTest.java @@ -31,7 +31,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -39,12 +38,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionHeaderContextualCardRendererTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java index 767adad66dda94aa1f6c3c05b2dcc3918cd41313..275e96b672bd6e0f699c49600d96a2c3c40850ee 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java @@ -19,12 +19,12 @@ package com.android.settings.homepage.contextualcards.conditional; import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionHeaderContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java index e8d5caa2fd244e0c2124e104dc1c2a56d92df268..215790893cfc0bec251de27d6fed78e8b277ecf0 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java @@ -26,16 +26,15 @@ import static org.mockito.Mockito.when; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionManagerTest { private static final long ID = 123L; @@ -48,7 +47,6 @@ public class ConditionManagerTest { private Context mContext; private ConditionManager mManager; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -128,5 +126,4 @@ public class ConditionManagerTest { verify(mConditionListener).onConditionsChanged(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java index 1c74ef32bcc6da55fdd76ac69c644fc226ad2369..3f57228368cdbe2c2b79d29ba46dbc959ea997a4 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java @@ -22,13 +22,12 @@ import static com.android.settings.homepage.contextualcards.conditional.Conditio import static com.google.common.truth.Truth.assertThat; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConditionalContextualCardTest { @Test(expected = IllegalArgumentException.class) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java index 9eb6145ce73a2507c9c054a7a3d7e796b786c8b8..5d72ee466134b6a46cad794b17cde00abc359cf8 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.conditional; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; @@ -24,16 +23,15 @@ import static org.mockito.Mockito.verify; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DndConditionalCardControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java index 0ef23be13b816c769551b7e754d951fff9dc313b..a0a6519921736195818a4020b1763940dafd1062 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java @@ -20,16 +20,15 @@ import static org.mockito.Mockito.verify; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NightDisplayConditionControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java index 2bc92a389197292875cdcc27be91936ff3ec5f27..299780c86ad2ef2454fe9e006dec18f8814c0b02 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java @@ -24,7 +24,6 @@ import android.app.Activity; import android.content.ComponentName; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -32,10 +31,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkModeConditionControllerTest { @Mock @@ -60,5 +60,4 @@ public class WorkModeConditionControllerTest { final ShadowActivity shadowActivity = Shadow.extract(mActivity); assertThat(shadowActivity.getNextStartedActivity().getComponent()).isEqualTo(componentName); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java index 72c29facb9021d52cd1e6097332644a5a5af903a..4699587a038f19c1e3b35565588be42519efcb52 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java @@ -33,17 +33,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatterySliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java index fc74df92ce723bc499b6e135dc3a96044886d8d3..1a3be6c90606509ada987b1cb95cda8422c3ac73 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java @@ -33,19 +33,19 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settings.testutils.shadow.ShadowDataUsageUtils; 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; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDataUsageUtils.class) public class DataUsageSliceTest { private static final String DATA_USAGE_TITLE = "Data usage"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java index 2083456531b67db1269b3d4aca6342d7a460b859..c1d732953ec8fdc95daecb558dfb4d8dbec799a7 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java @@ -33,7 +33,6 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeviceInfoSliceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java index 17d7bd2054134a1c7ecc1ec575b1d80689cd44c7..dc125e24c5cf379eae569aaf03415552bcfb3b0d 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java @@ -33,18 +33,18 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class StorageSliceTest { private static final String USED_BYTES_TEXT = "test used bytes"; private static final String SUMMARY_TEXT = "test summary"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java index 9d9d84e34a08d50fbca2c8b9ea7a8ca264c9ceac..ebc2154a0096bd9035b75e2d6d30719f1a475bdf 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.legacysuggestion; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ import android.content.Context; import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settingslib.suggestions.SuggestionController; @@ -34,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowThreadUtils.class) public class LegacySuggestionContextualCardControllerTest { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java index c337df1a94aacb8c31b2c0bd66bc639c7a8439da..218279401fc9ae4952c5bff8604ddf889de63cd6 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardRendererTest.java @@ -16,7 +16,6 @@ package com.android.settings.homepage.contextualcards.legacysuggestion; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -33,7 +32,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -41,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegacySuggestionContextualCardRendererTest { @Mock private ControllerRendererPool mControllerRendererPool; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java index 8b9a7a9aacaa6387385105854d8df4fed975a1b3..e0e5a0c6e426271915ad3f822441c2dc0755edaa 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/legacysuggestion/LegacySuggestionContextualCardTest.java @@ -23,12 +23,12 @@ import static org.mockito.Mockito.mock; import android.app.PendingIntent; import com.android.settings.homepage.contextualcards.ContextualCard; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LegacySuggestionContextualCardTest { @Test(expected = IllegalArgumentException.class) @@ -51,5 +51,4 @@ public class LegacySuggestionContextualCardTest { .build() .getPendingIntent()).isNotNull(); } - } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java index 1df527737e8b221ac809417439ec8c8857c7be5d..ff08c6aa31214a53afa84aa567e2a9c459062b31 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java @@ -35,13 +35,13 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipLoader; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -51,7 +51,7 @@ import org.robolectric.annotation.Resetter; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BatteryFixSliceTest { private Context mContext; @@ -123,7 +123,7 @@ public class BatteryFixSliceTest { return sBatteryTips; } - public static void setBatteryTips(List tips) { + private static void setBatteryTips(List tips) { sBatteryTips = tips; } } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java index ac6557e67d8ea8a89dea519c403b686c0e35eec2..51e8cc852ce51e60d61abae9f85cc2680eed1230 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java @@ -18,7 +18,7 @@ package com.android.settings.homepage.contextualcards.slices; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.slice.SliceProvider; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothDevicesSliceTest { private static final String BLUETOOTH_MOCK_SUMMARY = "BluetoothSummary"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java index 1bc4f2abf53d1f284d01511beee73fea707df73e..e2eb9bdc12d7d751a2755f41a7334fd0dee26f9b 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothUpdateWorkerTest.java @@ -26,16 +26,16 @@ import android.content.ContentResolver; import android.content.Context; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothAdapter.class}) public class BluetoothUpdateWorkerTest { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java index 9787aeec2868d334d6fac65dcc7281b2c864302d..3bd29b9ba3508ddfab6912e070791ad8c0681251 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/LowStorageSliceTest.java @@ -28,7 +28,6 @@ import androidx.slice.SliceProvider; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; @@ -37,6 +36,7 @@ import org.junit.After; 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; import org.robolectric.annotation.Implementation; @@ -45,7 +45,7 @@ import org.robolectric.annotation.Resetter; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LowStorageSliceTest { private Context mContext; @@ -124,7 +124,7 @@ public class LowStorageSliceTest { return sPrivateStorageInfo; } - public static void setPrivateStorageInfo( + private static void setPrivateStorageInfo( PrivateStorageInfo privateStorageInfo) { sPrivateStorageInfo = privateStorageInfo; } diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java index af3b2e8b015f75669a4492e1828eb722d7dea7ec..5bc36985d4bcddb0564037037c5ed7488e6dec06 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardControllerTest.java @@ -35,13 +35,13 @@ import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardFeedbackDialog; import com.android.settings.homepage.contextualcards.ContextualCardsFragment; 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.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -49,7 +49,7 @@ import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowContentResolver; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceContextualCardControllerTest { private static final String TEST_SLICE_URI = "content://test/test"; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java index 7d71302c4c6039a1b6e4a3797c6364292b4b074e..3407ee3679db3996352ac2e5a94491f2a1c87959 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java @@ -39,7 +39,6 @@ import com.android.settings.R; import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCardsFragment; import com.android.settings.homepage.contextualcards.ControllerRendererPool; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,9 +46,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceContextualCardRendererTest { private static final Uri TEST_SLICE_URI = Uri.parse("content://test/test"); diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index b672e58967fd3c18b9b14e925c726cdd391ab01e..ae5afd22a9b06e8b2075d75683135882ff133a5a 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -31,18 +31,17 @@ import android.content.Context; import android.hardware.input.InputManager; import android.view.InputDevice; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class GameControllerPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java index cb3d655711300cfc87eb93ff53a54ac8126b89bc..db821f3a39bcffb05205bc77fdf04397a0450f43 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java @@ -27,15 +27,15 @@ import android.os.Bundle; import androidx.fragment.app.FragmentActivity; 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.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InputMethodAndSubtypeEnablerTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java index 334ca4b90fdf033ab26f5bbb064d8b5a067b4a69..26cdd0a3f1fbe36a642fb4db6984fe7ee7fddf79 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList; import org.junit.Before; @@ -40,13 +39,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowInputMethodManagerWithMethodList.class) public class InputMethodAndSubtypePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index 005471f184b9d4900f55c43e1661f89ad353c210..a26ef8c6c34c6833bcd0bcc00431fcfb462b662d 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; import org.junit.Before; @@ -45,11 +44,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class KeyboardLayoutPickerControllerTest { @Mock @@ -118,7 +118,7 @@ public class KeyboardLayoutPickerControllerTest { mController.displayPreference(screen); - // We cretate a keyboard layouts in initializeOneLayout() + // We create a keyboard layouts in initializeOneLayout() assertThat(screen.getPreferenceCount()).isEqualTo(1); } @@ -130,7 +130,7 @@ public class KeyboardLayoutPickerControllerTest { mController.displayPreference(screen); - // We cretate two keyboard layouts in initializeOneLayout() + // We create two keyboard layouts in initializeOneLayout() assertThat(screen.getPreferenceCount()).isEqualTo(2); } diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 18813e6d20c0f2a5b7e0295aaaaf64c2042b4083..d675e8911e515369645acc8a12f1560acf4adfe3 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.view.InputDevice; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; import org.junit.After; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhysicalKeyboardPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 5a1a93b8858c589764f262709ed88f49e6e2ccc2..ead12cf7ebebdeef00150301e90d1d5029cdc146 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.view.textservice.TextServicesManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -37,9 +36,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 b81e5513396049fc7888e516cb2facf0057fb9a0..f3b1c905af4b90b7fd9accef91aadab5dec1dc9d 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java @@ -25,16 +25,15 @@ import android.database.MatrixCursor; import android.net.Uri; import android.provider.UserDictionary; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryCursorLoaderTest { private ContentProvider mContentProvider; diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java index 5c5042c1888ac0764b3b33cbf64b7f8ca63bf320..ff3f0ecfc142468f8d8af0fbedd034204a44a6a2 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java @@ -33,18 +33,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowContentResolver; import java.util.TreeSet; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryListControllerTest { private Preference mPreference; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 43e89ffe05cb99e76acfb88b0efa46b3571f14dc..2d5dee8cfe4b92b7d4139d7aee131ca435317505 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -34,20 +34,20 @@ import androidx.core.text.BidiFormatter; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VirtualKeyboardPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 43e8b18396afe1a64f28508bcb253f99ccb7a218..19e62b11c9e0a87270b45980c470846fa7b1c65f 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -45,7 +45,6 @@ import androidx.lifecycle.LifecycleObserver; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -56,12 +55,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LanguageAndInputSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 83b29fcdb62ed878667cb8819fd195456fca5582..b67cc5dbc1c61db38f5dafe9513f0934cd221116 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -28,20 +28,20 @@ import android.content.res.AssetManager; import androidx.preference.Preference; 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.Mock; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 8101d404b420e2e2a773f48223073f40e178e49e..a917a6d6143f41b2cec0d0addb04f09483ecdd05 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.spy; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 c483b8ccc9a09279d493c876b4b01a10bb995660..fdca6242aec0f064afa673d58f9f3ea7b518c50e 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -29,20 +29,19 @@ import android.speech.tts.TtsEngines; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TtsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index e1440b726056eb185a5492f98b14abbbb98ee0a8..29492b6862eef47eed1041e4032d3ec53cbf80a9 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -25,7 +25,6 @@ import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.inputmethod.UserDictionarySettings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.TreeSet; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserDictionaryPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java index 4db32bd8363e53922763a65e13fba65471d299a3..d84d77923a3f53179673b7f51daf2f74ccbefa55 100644 --- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java +++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java @@ -23,19 +23,16 @@ import android.view.View; import android.widget.TextView; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = ShadowSettingsPreferenceFragment.class) +@RunWith(RobolectricTestRunner.class) public class LocaleListEditorTest { private LocaleListEditor mLocaleListEditor; diff --git a/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java b/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java index bad3dbda032d6ecf8d62311f73fa6afa253dec3e..b2541472a5f8d7b7b8d51138965615d1443ebc57 100644 --- a/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java +++ b/tests/robotests/src/com/android/settings/localepicker/LocalePickerWithRegionActivityTest.java @@ -8,18 +8,18 @@ import static org.mockito.Mockito.spy; import android.app.Activity; import com.android.internal.app.LocaleStore; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalePickerWithRegionActivityTest { private LocalePickerWithRegionActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java index a15fdff40d5bf832336d3c78efd56c170fa74d18..eff5d4337ed54e16a9c7e64d831ca866b6860c5f 100644 --- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java @@ -5,16 +5,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppLocationPermissionPreferenceControllerTest { private AppLocationPermissionPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 6903bcd0c9872e2f5a5af2b642fbcef3c44ab5ce..1ae73c3425bbd08228660a4c59fc46896400dff4 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BluetoothScanningPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 3302d2aae7b8bb9409a36d11989742987a8f1f64..e3808305982a6afe8ef544fc287f904ef5670576 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -43,7 +43,6 @@ import android.text.TextUtils; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -53,18 +52,15 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowSecureSettings.class, - LocationEnablerTest.ShadowLocationManager.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowSecureSettings.class) public class LocationEnablerTest { @Mock @@ -273,13 +269,4 @@ public class LocationEnablerTest { private static ArgumentMatcher actionMatches(String expected) { return intent -> TextUtils.equals(expected, intent.getAction()); } - - @Implements(value = LocationManager.class) - public static class ShadowLocationManager { - - @Implementation - public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { - // Do nothing - } - } } diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 00d8adb2acd2b272f9711f61a4d4d8e12852068e..2abef4ed875195bdaa4d5fa728dec2dac4215037 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -17,8 +17,8 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -51,12 +50,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationFooterPreferenceControllerTest { @Mock @@ -88,7 +88,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_hasValidFooter_returnsTrue() throws NameNotFoundException { + public void isAvailable_hasValidFooter_returnsTrue() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -99,7 +99,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_noSystemApp_returnsFalse() throws NameNotFoundException { + public void isAvailable_noSystemApp_returnsFalse() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ false, /*hasRequiredMetadata*/ true)); @@ -109,7 +109,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void isAvailable_noRequiredMetadata_returnsFalse() throws NameNotFoundException { + public void isAvailable_noRequiredMetadata_returnsFalse() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ false)); @@ -131,7 +131,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_sendBroadcast() throws NameNotFoundException { + public void updateState_sendBroadcast() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -145,7 +145,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_addPreferences() throws NameNotFoundException { + public void updateState_addPreferences() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); @@ -158,7 +158,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_notSystemApp_ignore() throws NameNotFoundException { + public void updateState_notSystemApp_ignore() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ false, /*hasRequiredMetadata*/ true)); @@ -170,7 +170,7 @@ public class LocationFooterPreferenceControllerTest { } @Test - public void updateState_thenOnPause_sendBroadcasts() throws NameNotFoundException { + public void updateState_thenOnPause_sendBroadcasts() { final List testResolveInfos = new ArrayList<>(); testResolveInfos.add( getTestResolveInfo(/*isSystemApp*/ true, /*hasRequiredMetadata*/ true)); diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 58874be9a3089d872cf168aa3fd8873f21c6b51d..9034688f899994ef8146ec3755e682fae3071c3a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -35,7 +35,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -45,13 +44,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationForWorkPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java index 994a8fd4316f0561b9e99cf1a63ee14924a01c77..b85377c5356500d3facf74d421b12ed03110ab8f 100644 --- a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java @@ -21,16 +21,16 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.R; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationScanningPreferenceControllerTest { private Context mContext; private LocationScanningPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index 81e5f7c2426c981ba30345c0a3c0a46a30d997e9..75d6f8214eaa4cbfff333c2683cb903a0e358b62 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -48,17 +47,15 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; 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(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowUserManager.class) public class LocationServicePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -90,7 +87,6 @@ public class LocationServicePreferenceControllerTest { when(mCategory.getKey()).thenReturn(key); when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)) .thenReturn(mDevicePolicyManager); - } @Test diff --git a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java index 83d14e4166e590ad84e71b84c609261c377c62e2..4885df997c07a834e53a38d741ef6221353e1048 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.os.Bundle; import com.android.settings.SettingsActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import org.junit.Before; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java index 8f1045ad0eed6bf2a72a34d9f2fee4ff6d331210..427307dcc984788b87302ec4603d82cd0ddf2809 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceTest.java @@ -13,17 +13,17 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index 475cb831544969387f022010d756eb14b7d2e1e3..ab9e4e55e78e91770ee1885fefbb5a5f932c6e6c 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; @@ -38,10 +37,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocationSwitchBarControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 10e5681382de2c9bfb4eec7b02d986b88c40232e..d4b4ac31bd1d83e94989262087178b00389a5f95 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -41,7 +41,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; @@ -56,12 +55,13 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index be56f96f83ee0d8ad880df54f9816ab41c7654d1..7411afe1b4bbcb07418c5d419cafbbb3da0b55bf 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -31,7 +31,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; @@ -42,13 +41,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Collections; /** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentLocationRequestSeeAllPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java index a07a1c7f16d039c547663e794198b09eee4e3aed..649726a0bd30559885958041bb8200665ee54fea 100644 --- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java +++ b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java @@ -22,16 +22,16 @@ import android.content.Context; import android.provider.SearchIndexableResource; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScanningSettingsTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index fa0b64958a6d0acee217e95fec17cdf7288042ed..53acda314b8ed571aba87bf7dc369cc833953610 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -26,16 +26,15 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiScanningPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 46d177f88a954b5c46f54fd2de66a3af95f95003..a645bfa4f1a24f5c59877b22bb2a9232e7bde706 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,10 +42,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AirplaneModePreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index db970fb4d3359a87769da5a9ada717bb808fc404..8624eb91adb0621d8a603704b9f6471ae1967385 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -46,7 +46,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -57,12 +56,13 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApnEditorTest { - private static final Object[] APN_DATA = new Object[] { + private static final Object[] APN_DATA = { 0, /* ID */ "apn_name" /* apn name */, "apn.com" /* apn */, @@ -137,7 +137,7 @@ public class ApnEditorTest { any(String.class), any(String[].class), any(String.class)); - } + } @Test public void testSetStringValue_valueChanged_shouldSetValue() { @@ -465,7 +465,7 @@ public class ApnEditorTest { private void initCursor() { doReturn(2).when(mCursor).getColumnCount(); - doReturn(Integer.valueOf(2)).when(mCursor).getInt(CURSOR_INTEGER_INDEX); + doReturn(2).when(mCursor).getInt(CURSOR_INTEGER_INDEX); doReturn("str").when(mCursor).getString(CURSOR_STRING_INDEX); doReturn(Cursor.FIELD_TYPE_INTEGER).when(mCursor).getType(CURSOR_INTEGER_INDEX); doReturn(Cursor.FIELD_TYPE_STRING).when(mCursor).getType(CURSOR_STRING_INDEX); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index a8959c7ac564134a18d37f6297662bd332836b75..43e8c471ec584c248a0bb4d7ba698986d6ae4e9a 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -47,7 +47,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -61,13 +60,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowConnectivityManager.class, - ShadowUserManager.class} -) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MobileNetworkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java index 257446053ccf4f50f82d22a8afcea4b2d87e52dc..ab34087865363239d0dd90b08bb7ffacea696876 100644 --- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobilePlanPreferenceControllerTest { @Test diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index e0370a49fd9a8621a332bf915bb180cf54b1242b..e84d286cfa55dd159ee671d5f3d0d89a6ee65924 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -20,17 +20,17 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.SearchIndexableResource; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkDashboardFragmentTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 8b0fe98568dc6c6effa04480d9279a849d32babe..73f4b6a0b7bfb04d080bc6908c7ffa627ea9daf3 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -22,17 +22,16 @@ 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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkResetPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 35431a092157bcfc2992a457933ea1bf389743ee..8996c1d24a2f0a61d4d5c23a3dd6444d29a619d1 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -26,15 +26,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 7b940456c05c5a414c5cf8ee2145f7c74fd47c4b..3593cf7cf6b3a6da0a3952826292b708791fe8c6 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -30,19 +30,19 @@ import android.net.NetworkScorerAppData; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 83fa55cfe0aee0f597e3032231b745226a3e2373..7607f91c611a70e468085a57a8f69a877b6c7e20 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -17,8 +17,8 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -34,7 +34,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.google.android.collect.Lists; @@ -45,11 +44,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkScorerPickerTest { private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1"; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 2e3e819986c22941e1ec999dc63f95c096121dc3..a7e59fcc20d6b9ff2da9ff3b2727a5753d0b47cd 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -40,7 +40,6 @@ import android.widget.LinearLayout; import androidx.appcompat.app.AlertDialog; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowOs; import com.android.settingslib.CustomDialogPreferenceCompat.CustomPreferenceDialogFragment; @@ -48,11 +47,12 @@ 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; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowOs.class) public class PrivateDnsModeDialogPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index 464b290674498ff403c8f8d99684274b3816569f..15fa5de86736e8fbe4d2e89127aa2f168b77b44d 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -31,8 +31,8 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; @@ -60,7 +60,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -72,6 +71,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -83,7 +83,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, ShadowDevicePolicyManager.class diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java index 02e40243150db3559c8df0506ff39b9643e2152a..e0334b1557485abd473f0372eb09f998fea44a8b 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java @@ -24,19 +24,18 @@ import static org.mockito.Mockito.when; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -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.RobolectricTestRunner; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SubscriptionUtilTest { @Mock private SubscriptionManager mManager; diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java index 88ea2eac5227fa2437f9c5f197c0d0b02ea8b2ce..79d3fdc0ed5c120552e7af1b0b8b6732f5ea58a0 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java @@ -18,10 +18,8 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.AdditionalMatchers.eq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -31,15 +29,12 @@ import static org.mockito.Mockito.when; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; import android.telephony.SubscriptionManager; import com.android.settings.network.SubscriptionsChangeListener.SubscriptionsChangeListenerClient; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,9 +42,10 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SubscriptionsChangeListenerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index e800cdd76381bdb2dd52440d8e95581125f66698..3958589972b9f98111a623b46bde01ccbd528766 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.network; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -38,19 +38,19 @@ import android.provider.Settings; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.atomic.AtomicReference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index 8198042efb4d7ac28df291bd326768b1cf58d99e..2135331e2dc10836825bb784c7ecb910580b02b9 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.wifi.WifiMasterSwitchPreferenceController; @@ -32,14 +31,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; 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) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class TopLevelNetworkEntryPreferenceControllerTest { @@ -87,7 +86,6 @@ public class TopLevelNetworkEntryPreferenceControllerTest { when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false); when(mTetherPreferenceController.isAvailable()).thenReturn(false); - assertThat(mController.getSummary()) - .isEqualTo("Wi\u2011Fi and data usage"); + assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage"); } } diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 11541ed2ab276d38fbed7118c777889cbf68860f..5144877cb24e4045a23fcb77ae8b427bdc5bf2f2 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -41,7 +41,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.internal.net.VpnConfig; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,10 +48,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowServiceManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VpnPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java index 96644285930a97a926dddd0796e668ef492c1a11..e2ac8ce22d031128a8aea92c33e30b1bc590414f 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java @@ -37,7 +37,6 @@ import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; import com.android.settings.network.ApnSettings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -47,8 +46,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ApnPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java index 054a6bd45b269e87c180bf54c24e982cbbbe2877..fc8fb160a62ad6b06e0ddaa1ad8420462d214657 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -49,9 +48,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.ArgumentCaptor; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CarrierPreferenceControllerTest { private static final int SUB_ID = 2; private static final String CARRIER_SETTINGS_COMPONENT = "packageName/className"; diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java index 85a627d35d8d250ac4555cab7067d5fb19b1e4bb..8907164c6667623b36052062e210f52d86df4bf2 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.text.TextUtils; import androidx.preference.Preference; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -49,8 +48,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataServiceSetupPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java index 1d91bb875ba98284b919ac1b7e1f3374c93d7413..f77a94f9086ccacbc76047c3d9ad6a37c4ca2db2 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.telephony.TelephonyManager; import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -42,8 +41,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DataUsagePreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java index 02710fbb0bcfce5c0ca2e59a41e8916d6c68aaa3..9b8a3e379f58a9808a57268e89bbea0061b02c64 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java @@ -36,16 +36,16 @@ import android.telephony.TelephonyManager; import androidx.preference.ListPreference; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EnabledNetworkModePreferenceControllerTest { private static final int SUB_ID = 2; @@ -149,5 +149,4 @@ public class EnabledNetworkModePreferenceControllerTest { Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java index 1d80da7c1ca096eaeaef4ed7119c47edce2cb88b..78ed4b596d31d38587181b06c4d3a9e38981e6fd 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.SwitchPreference; import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class Enhanced4gLtePreferenceControllerTest { private static final int SUB_ID = 2; @@ -134,5 +134,4 @@ public class Enhanced4gLtePreferenceControllerTest { assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java index 5269dd7265a0543e09e9313afedd6c097d71261d..072c835bb1c71ce3625fd31157442c00f0ad4861 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java @@ -49,7 +49,6 @@ import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -57,11 +56,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class Enhanced4gLteSliceHelperTest { @Mock @@ -275,7 +275,7 @@ public class Enhanced4gLteSliceHelperTest { return mSubId; } - protected void setDefaultVoiceSubId(int id) { + private void setDefaultVoiceSubId(int id) { mSubId = id; } } diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java index 8fd2c28b2a064dc82077f3852c1c120b216d65bd..7fbddb4916947871127c7bc38f9ee7f2b4365436 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java @@ -30,8 +30,6 @@ import android.telephony.euicc.EuiccManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,8 +37,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EuiccPreferenceControllerTest { private static final int SUB_ID = 2; @@ -75,5 +74,4 @@ public class EuiccPreferenceControllerTest { assertThat(captor.getValue().getAction()).isEqualTo( EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java index e1ad93bdb8e10a6cfc92da1d737b88bcd5afb9a6..e0bfce44e4b6b119e19d74f5bbb056e7abb9a172 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java @@ -35,16 +35,15 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileDataPreferenceControllerTest { private static final int SUB_ID = 2; @@ -145,5 +144,4 @@ public class MobileDataPreferenceControllerTest { verify(mTelephonyManager).setDataEnabled(true); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java index 68634a85eb2489ed0be7732c80868df5fac0dcbd..f13746c13f2ec8a33c6e5eca2bb4e9b46799a576 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java @@ -40,7 +40,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.internal.view.menu.ContextMenuBuilder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.material.bottomnavigation.BottomNavigationView; @@ -50,12 +49,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileNetworkActivityTest { private static final int CURRENT_SUB_ID = 3; @@ -159,14 +159,12 @@ public class MobileNetworkActivityTest { @Test public void onSaveInstanceState_saveCurrentSubId() { - mMobileNetworkActivity = Robolectric.buildActivity( - MobileNetworkActivity.class).get(); + mMobileNetworkActivity = Robolectric.buildActivity(MobileNetworkActivity.class).get(); mMobileNetworkActivity.mCurSubscriptionId = PREV_SUB_ID; final Bundle bundle = new Bundle(); mMobileNetworkActivity.saveInstanceState(bundle); - assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo( - PREV_SUB_ID); + assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo(PREV_SUB_ID); } } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java index 8a57a0cc75124a589b1d06ded8b13d766fac5764..7ba1eb962eeb7c472a1f5f9ee0200f88c6f93d45 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java @@ -41,19 +41,19 @@ import android.telephony.TelephonyManager; import com.android.internal.telephony.PhoneConstants; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MobileNetworkUtilsTest { private static final String PACKAGE_NAME = "com.android.app"; private static final int SUB_ID_1 = 1; diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java index 956b601010091398162a65aa4bd5809236472767..2aa68f713515de94568edd0c5eb150ea9db99a5a 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java @@ -30,18 +30,17 @@ import android.telephony.TelephonyManager; import androidx.preference.PreferenceCategory; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NetworkSelectSettingsTest { private static final int SUB_ID = 2; @@ -103,5 +102,4 @@ public class NetworkSelectSettingsTest { (NetworkOperatorPreference) mPreferenceCategory.getPreference(0); assertThat(preference.getCellInfo()).isEqualTo(mCellInfo2); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java index d11e11c185b3e04b51b1635aefcdfbb10afa3b08..6807ab67f000fce8121455d43b7530c3c4326395 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java @@ -35,21 +35,19 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.ListPreference; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PreferredNetworkModePreferenceControllerTest { private static final int SUB_ID = 2; - @Mock - private FragmentManager mFragmentManager; @Mock private TelephonyManager mTelephonyManager; @Mock @@ -140,5 +138,4 @@ public class PreferredNetworkModePreferenceControllerTest { Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo( TelephonyManager.NETWORK_MODE_LTE_TDSCDMA); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java index 79d281f3fda1b8e1c48d72413804e88461f30148..ce61a898a6e816e1785db1357cce2b2f7d54463b 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RoamingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -140,5 +140,4 @@ public class RoamingPreferenceControllerTest { assertThat(mPreference.isEnabled()).isTrue(); assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java index e50e2646e5a3e09f5157859ec2ad6e075de853f2..a0570225854722750999e643555ac6ed89024b5a 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java @@ -30,16 +30,16 @@ import android.telephony.ims.feature.ImsFeature; import androidx.preference.SwitchPreference; import com.android.ims.ImsManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VideoCallingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -125,5 +125,4 @@ public class VideoCallingPreferenceControllerTest { assertThat(mPreference.isEnabled()).isTrue(); assertThat(mPreference.isChecked()).isTrue(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java index a209b00415ba6438b7e70ce70ddf5f4f12315418..452e9b10486588b832644d2889d689101d4aa69c 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java @@ -32,16 +32,16 @@ import androidx.preference.PreferenceScreen; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -76,7 +76,6 @@ public class WifiCallingPreferenceControllerTest { when(mPreferenceScreen.findPreference( WifiCallingPreferenceController.KEY_PREFERENCE_CATEGORY)).thenReturn( mPreferenceCategory); - } @Test @@ -110,5 +109,4 @@ public class WifiCallingPreferenceControllerTest { assertThat(mPreferenceCategory.isVisible()).isFalse(); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java index 894564987ca8bd24b0f53c96833b71cba178344c..40329a5768c62c4568b37520c7f57f2905d187dc 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java @@ -26,16 +26,15 @@ import android.telephony.TelephonyManager; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaListPreferenceTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java index 4044b6caf983669b26e5c41c1a2f80ab6af31e96..d94ffae3c25a0f17983b402184a177da8ae1ed37 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java @@ -35,16 +35,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import com.android.internal.telephony.Phone; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaSubscriptionPreferenceControllerTest { private static final int SUB_ID = 2; diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java index f00afc97bbc74417d04f06c7786b0f13c849c48a..fee6099b84f67fb69e5ec495273e153d4f1aab1f 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java @@ -33,16 +33,15 @@ import android.telephony.TelephonyManager; import androidx.preference.ListPreference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CdmaSystemSelectPreferenceControllerTest { private static final int SUB_ID = 2; @@ -126,7 +125,6 @@ public class CdmaSystemSelectPreferenceControllerTest { assertThat(mPreference.isEnabled()).isFalse(); } - @Test public void updateState_stateOther_resetToDefault() { Settings.Global.putInt(mContext.getContentResolver(), @@ -144,5 +142,4 @@ public class CdmaSystemSelectPreferenceControllerTest { TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo( TelephonyManager.CDMA_ROAMING_MODE_ANY); } - } diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java index 5f65241982139c4c24b7fecf303517b2417ec57c..6639aaeebbf180e82da1379fb64f4e30e69ce6af 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.telephony.TelephonyManager; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -40,9 +39,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSelectPreferenceControllerTest { private static final int SUB_ID = 2; private static final String OPERATOR_NAME = "T-mobile"; diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java index d5fc6e045d6d045a8d0119aed7dd6f13ea6d749d..d37d934da67abfb8ad8a0e1d01bf3d6258d9835a 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java @@ -32,16 +32,16 @@ import android.telephony.TelephonyManager; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OpenNetworkSelectPagePreferenceControllerTest { private static final int SUB_ID = 2; private static final String OPERATOR_NAME = "T-mobile"; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index bf2c132f0c66aee8045e9272e9ff6a6ff8ae7171..8ed9dcc2c8076050252a4440885afdb0cd53e973 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedPreference; @@ -39,13 +38,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AndroidBeamPreferenceControllerTest { Context mContext; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 5dfc4f7366fdc53f273fbf0b13c5ab5d4a96dd2e..06d9773deb70f6859ffad18747b51903193fd248 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -26,21 +26,21 @@ import android.provider.Settings.Global; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowNfcAdapter; 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; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowNfcAdapter.class}) public class NfcAirplaneModeObserverTest { - Context mContext; + private Context mContext; private NfcAdapter mNfcAdapter; private SwitchPreference mNfcPreference; private NfcAirplaneModeObserver mNfcAirplaneModeObserver; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java index cba7091189204c65b3f71554c80055a7923bd4c2..c3dfe48a7754c5e29616058432b2a8888b5c1a4c 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java @@ -28,16 +28,15 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcEnablerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java index 113cb29bc0c4d573a8593c70b1f9de0635d7ae88..b8e3a338d6e07c5bea4a83595989602474dc2f31 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java @@ -29,18 +29,18 @@ import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcForegroundPreferenceControllerTest { private static final String PREF_KEY = PaymentSettingsTest.FOREGROUND_KEY; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java index 7db070d25ef924b1e685ceedd1fd43fd210f8d91..b69e1727762c05384e1e4c1143b9a3e5d070b981 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java @@ -29,18 +29,18 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcPaymentPreferenceControllerTest { private static final String PREF_KEY = PaymentSettingsTest.PAYMENT_KEY; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 90a71e5e989b7bd88f36b23aa38b15cb1ab977e3..8883ddf7e3a9cd3f4856cb19aa31501b65a4e294 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -31,23 +31,21 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NfcPreferenceControllerTest { - @Mock private NfcAdapter mNfcAdapter; @Mock diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index b85bddad55e249b46f0dc4561974c698a557fa07..1293ee4d0ff13d2f70b73eb0df7fef495c8bb464 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -29,13 +29,12 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -44,7 +43,7 @@ import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = PaymentSettingsTest.ShadowPaymentBackend.class) public class PaymentSettingsTest { @@ -124,7 +123,7 @@ public class PaymentSettingsTest { } @Implementation - public List getPaymentAppInfos() { + protected List getPaymentAppInfos() { return mAppInfos; } } diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 6537a405c766d6d705c7364cf6f697ded57f612d..3126cdf1fa81a9f56787d353f728acd49fc1b983 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -32,7 +32,6 @@ import android.os.UserManager; import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -40,9 +39,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AdjustVolumeRestrictedPreferenceControllerTest { private static final String KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java index 9103cfa350b3ad13635a421f06b99e1e1b301b14..283f19331d9e9d43f42cb86cdb54762a02048f9e 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.media.RingtoneManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlarmRingtonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 517c94b9fe77d5c47d2470accde59741f4dfcd04..2120cd98e5c0eed3c6441b0839a7c69645ac5f6d 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -23,17 +23,16 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.AudioManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AlarmVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index a9df13569e2118edc640b34137efc9c8f524661c..88f8303b1793800ec80c2f2cdc501cfc4b125a12 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -21,10 +21,9 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -41,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -51,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AllowSoundPreferenceControllerTest { private Context mContext; @@ -84,14 +83,14 @@ public class AllowSoundPreferenceControllerTest { } @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_notIfNull() throws Exception { + public void testIsAvailable_notIfNull() { mController.onResume(null, mock(NotificationChannel.class), null, null); assertFalse(mController.isAvailable()); @@ -100,7 +99,7 @@ public class AllowSoundPreferenceControllerTest { } @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); @@ -108,7 +107,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfAppCreatedChannel() throws Exception { + public void testIsAvailable_notIfAppCreatedChannel() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); when(channel.getId()).thenReturn("something new"); @@ -117,7 +116,7 @@ public class AllowSoundPreferenceControllerTest { } @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); @@ -127,7 +126,7 @@ public class AllowSoundPreferenceControllerTest { } @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( @@ -140,7 +139,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_notConfigurable() throws Exception { + public void testUpdateState_notConfigurable() { String lockedId = "locked"; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); appRow.lockedChannelId = lockedId; @@ -155,7 +154,7 @@ public class AllowSoundPreferenceControllerTest { } @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"); @@ -168,7 +167,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_checkedForHighImportanceChannel() throws Exception { + public void testUpdateState_checkedForHighImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); @@ -179,7 +178,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_checkedForUnspecifiedImportanceChannel() throws Exception { + public void testUpdateState_checkedForUnspecifiedImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_UNSPECIFIED); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); @@ -190,7 +189,7 @@ public class AllowSoundPreferenceControllerTest { } @Test - public void testUpdateState_notCheckedForLowImportanceChannel() throws Exception { + public void testUpdateState_notCheckedForLowImportanceChannel() { NotificationChannel channel = mock(NotificationChannel.class); when(channel.getImportance()).thenReturn(IMPORTANCE_LOW); mController.onResume(new NotificationBackend.AppRow(), channel, null, null); diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 83c0b06b8ac6eb99ae940677588119c6903f406a..9cc1c072938389321b8a3f01d6547f747385393c 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -20,10 +20,9 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,17 +35,16 @@ import android.os.UserManager; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppLinkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index dc368a254b625321c049528edc20dfad6d1eadcd..8265295a76b0757d80308a11496284782141b1c9 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -22,8 +22,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.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -43,7 +43,6 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -53,10 +52,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BadgePreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 72313bb5850210a7a90ce97f7ee4a00cb8aefe2c..89cf2f719ba28a7fd310fc69d3940e3c4aedc13d 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -34,17 +34,16 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BadgingNotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index 0ebcaefa4354ca1f913f0bc37b34534919918684..4f6944a3ce40771cc1be063271718f239f61ddfc 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -23,11 +23,10 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -45,7 +44,6 @@ import android.content.Context; import android.os.UserManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settingslib.widget.LayoutPreference; @@ -54,10 +52,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BlockPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index 220269ebef446395eb90de3a10dffe1b8835f995..9a2ab9be76510ecc3d5e36f6ef8e3dc76ae24a3d 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -28,7 +28,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -36,8 +35,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BootSoundPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index c3c0a33b0efe96dcc6de89bbedb878fe790dfd17..966d4e1ac0b30285ec5f4a83227e31ede2b45654 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -27,19 +27,16 @@ import android.content.Context; import android.media.AudioManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowAudioManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowAudioManager.class}) +@RunWith(RobolectricTestRunner.class) public class CallVolumePreferenceControllerTest { private static final String TEST_KEY = "Test_Key"; @@ -48,7 +45,7 @@ public class CallVolumePreferenceControllerTest { private Context mContext; private CallVolumePreferenceController mController; - private ShadowAudioManager mShadowAudioManager; + private AudioManager mAudioManager; @Before public void setUp() { @@ -56,7 +53,7 @@ public class CallVolumePreferenceControllerTest { mContext = RuntimeEnvironment.application; mController = new CallVolumePreferenceController(mContext, TEST_KEY); mController.setAudioHelper(mHelper); - mShadowAudioManager = ShadowAudioManager.getShadow(); + mAudioManager = mContext.getSystemService(AudioManager.class); } @Test @@ -80,14 +77,14 @@ public class CallVolumePreferenceControllerTest { @Test public void getAudioStream_onBluetoothScoOff_shouldEqualToStreamVoiceCall() { - mShadowAudioManager.setBluetoothScoOn(false); + mAudioManager.setBluetoothScoOn(false); assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_VOICE_CALL); } @Test public void getAudioStream_onBluetoothScoOn_shouldEqualToStreamBtSco() { - mShadowAudioManager.setBluetoothScoOn(true); + mAudioManager.setBluetoothScoOn(true); assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_BLUETOOTH_SCO); } diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java index badce887372b67761b1877c0c3a6eff4fbe08261..9f39c18e9a5f7b1ed036165ddd19f9bf4f4e938e 100644 --- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java @@ -21,20 +21,19 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CastPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 4d22bfe8e0fc7f8592accde5da21f9aeee16f0e5..c8ec1f484bd84818e5fcb074eb830f37a9151f40 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -30,17 +30,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChargingSoundPreferenceControllerTest { @Mock @@ -103,8 +102,7 @@ public class ChargingSoundPreferenceControllerTest { mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, true); - assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)) - .isEqualTo(1); + assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)).isEqualTo(1); } @Test @@ -113,7 +111,6 @@ public class ChargingSoundPreferenceControllerTest { mPreference.getOnPreferenceChangeListener().onPreferenceChange(mPreference, false); - assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)) - .isEqualTo(0); + assertThat(Secure.getInt(mContentResolver, Secure.CHARGING_SOUNDS_ENABLED, 1)).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java index d3463ce770b63cdf2b292f74d683bf66e2f37669..69102971f176283e21c4563fe4e338d88c69ab49 100644 --- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java @@ -37,7 +37,6 @@ import android.app.Activity; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.notification.ConfigureNotificationSettings.SummaryProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; @@ -46,12 +45,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConfigureNotificationSettingsTest { private Activity mActivity; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 6d3f1b42b2ffff7e3acdaa2c697136b52f381548..d9929c430de1d87a89851707145d71085b0f059c 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.notification; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -34,18 +34,17 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DeletedChannelsPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 649918ab969f3a4464e4d0183aa322adefa26b37..ff6ff91eaee8087dd968ab37a176df108c4ed487 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -19,10 +19,9 @@ package com.android.settings.notification; 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -35,17 +34,16 @@ import android.os.UserManager; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DescriptionPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 8bc6d34fea333e2714b987ddc84ad24349298b84..fa95e52ebf6af354ab9b46652241cab78760d61e 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DialPadTonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index e086e7fc64f508317cf683e80a07a4c4e50a14b1..0b2af49e8305d911c327ff112747d03b139787c6 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -21,8 +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.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -40,7 +40,6 @@ import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -50,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DndPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 7ad6230e19645d7a31fc0864455f44158961062b..db502144493c97702f0686e37d5484b9591df8d8 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -19,7 +19,7 @@ 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.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -31,16 +31,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.DropDownPreference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DockAudioMediaPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index a087cf20d28b4f35001129d43af6ed830c52dc84..b6942684351717dd3c95ae275d0d736989ad2c34 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DockingSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index ef382111ce2d55b8f46e57aa8208f050e167a904..822ca5f55335571f1654bad170df256a3afb7014 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -29,7 +29,6 @@ import android.content.pm.PackageManager; import android.os.UserManager; import com.android.settings.accounts.AccountRestrictionHelper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import org.junit.Before; @@ -38,8 +37,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyBroadcastPreferenceControllerTest { private static final String PREF_TEST_KEY = "test_key"; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 5c71c643f46a333659ee64d9d017a53149111d75..49776de679f6c5cba39e1fcd8c5e662df67b3e45 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.DropDownPreference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EmergencyTonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 04dac26708666b1b8eb7ecd8d8fa19f6bb09ace0..de84f0755c35840548ea1fc8939d1808cc3781d7 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -18,10 +18,10 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -38,17 +38,17 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceFragmentCompat; import com.android.settingslib.widget.LayoutPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HeaderPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 0c706fbdaaf16d40d9cb109b35ff4ef739c61e52..99d3376e82ecfe5f73bd692b8f5464de9c40bf5d 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -21,12 +21,12 @@ 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.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -42,7 +42,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.RestrictedListPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ImportancePreferenceControllerTest { private Context mContext; @@ -194,7 +194,7 @@ public class ImportancePreferenceControllerTest { } @Test - public void testImportanceHightToLow() { + public void testImportanceHighToLow() { NotificationChannel channel = new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH); channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT); diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 6ceaffa7ee81f499b60eb12840ff07d0f34b4c43..dd6a6208381eb26c0eb85547636e4cb7b3b620c3 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -22,9 +22,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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -42,22 +41,23 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class LightsPreferenceControllerTest { @@ -88,6 +88,11 @@ public class LightsPreferenceControllerTest { Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void testNoCrashIfNoOnResume() { mController.isAvailable(); diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 49fd6d4937727590745a5ee6e533fd7f2486e497..657b35215981722ae82ddacedba73c3d9d5c56a8 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.media.AudioManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MediaVolumePreferenceControllerTest { private MediaVolumePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java index 58b5ea3c9667ddf5ad4a6d5b0fd95534d0fdf9d8..cf476c17659fbaae2d6c0778fdd5200d5d1b903e 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java @@ -16,22 +16,22 @@ package com.android.settings.notification; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 af810ace4780500d7b5bd1e869692dd09794f3a3..4b2c74e8d7d827462a2f87573394c01c5a6d794c 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -31,15 +31,15 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationAppPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index 088fadee98e046a19906f976d97dd27aa0b3953c..2c2e3791ab878d5d38b9163e9d9c1c5c8993ccd7 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -18,24 +18,24 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -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.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import android.app.usage.UsageEvents; import android.os.Parcel; import com.android.settings.notification.NotificationBackend.AppRow; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationBackendTest { @Test diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 5d6e1fed14293b8d379a84a8f0fb97a19b459c55..1ad93780fa32d6750187825256de03c5c6bed5f0 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -23,10 +23,9 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -42,7 +41,6 @@ import android.os.UserManager; import androidx.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; @@ -51,10 +49,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java index 21737c146bd10f73485399e7defff67f11d32a92..1aecad512429aca81e2ed8baf68a870b8a5a856e 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java @@ -20,16 +20,15 @@ import static com.google.common.truth.Truth.assertThat; import android.media.RingtoneManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationRingtonePreferenceControllerTest { private NotificationRingtonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index cd3fad716288f24be7024fa1dc7dffeb92e757c6..8e1b015b859f3fd028f70cb286e8bcdcbcf1cc69 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -26,17 +26,16 @@ import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index 65c60c7222b5143547c79b0568d027bf7cca68de..1f317d974e1cbec6708298b06d7146941d58b653 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -32,17 +32,16 @@ import android.os.UserManager; import androidx.preference.Preference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotificationsOffPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 7a98386ea2485d79940ed17780553e1a95d26b12..24e845851a49ffa4ddb5ad7fb31fb95b1543443c 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -24,17 +24,16 @@ import android.content.Context; import android.media.RingtoneManager; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PhoneRingtonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 235d7b277e3e49309694ffaa642e0b9a7942f906..93b86210d9f369e285116a33c37dc685fb438b88 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -42,9 +41,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PulseNotificationPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index e222b20551cfce7e9cd09aaa04f28127be88a17d..4221a2117cf3373a2293f71290b019319e885530 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -18,10 +18,10 @@ 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; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -48,7 +48,6 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.instantapps.InstantAppDataProvider; @@ -60,6 +59,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -67,7 +67,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RecentNotifyingAppsPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index 2f273aed9e215cba648928749c29b76563ebb833..61fe0258682c24b17c697b92a8eece220fd6a590 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -19,9 +19,6 @@ import android.widget.RadioButton; import com.android.settings.R; import com.android.settings.RestrictedRadioButton; import com.android.settings.notification.RedactionInterstitial.RedactionInterstitialFragment; -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.ShadowRestrictedLockUtilsInternal; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -30,14 +27,12 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class, ShadowRestrictedLockUtilsInternal.class, ShadowUserManager.class, diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 50a01bc89dc341d3222e816a85a049c57e389427..e89edb4ba5ffa4055a57d594a5922ddffbafb433 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -27,17 +27,16 @@ import android.media.AudioManager; import android.os.Vibrator; import android.telephony.TelephonyManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RingVolumePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index 3bd3292789507da992bca9d5a3792b07b76592ef..f22a78225a2c9d09f080e1d5e538e86a165e37a5 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,15 +27,14 @@ import android.media.RingtoneManager; import androidx.preference.Preference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RingtonePreferenceControllerBaseTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index d3d4bc1b3df467afc7ea4225c1a29ac434f5cea8..f1927b47e4e7932e093fe30bc7171c1b086bf210 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -30,17 +30,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenLockSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 6d51cde5687d045413ba1bc30be4ddb0162e44cf..6dec2d916afd57b960dd231438c400f51fd7e064 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,12 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingPrefControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index cfffbdcfd7664c85d6886d925f71749d8f824eea..1b4ede5b14ffbea9dafb2b373efa276d15df80aa 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -21,8 +21,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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -48,23 +48,20 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.RestrictedLockUtils; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.class) +@RunWith(RobolectricTestRunner.class) public class SoundPreferenceControllerTest { private Context mContext; @@ -89,20 +86,13 @@ public class SoundPreferenceControllerTest { ShadowApplication shadowApplication = ShadowApplication.getInstance(); shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm); shadowApplication.setSystemService(Context.USER_SERVICE, mUm); - SettingsShadowResources.overrideResource(com.android.internal.R.string.ringtone_silent, - "silent"); mContext = RuntimeEnvironment.application; mController = spy(new SoundPreferenceController( mContext, mFragment, mImportanceListener, mBackend)); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test - public void testNoCrashIfNoOnResume() throws Exception { + public void testNoCrashIfNoOnResume() { mController.isAvailable(); mController.updateState(mock(NotificationSoundPreference.class)); mController.onPreferenceChange(mock(NotificationSoundPreference.class), Uri.EMPTY); @@ -112,14 +102,14 @@ public class SoundPreferenceControllerTest { } @Test - public void testIsAvailable_notIfChannelNull() throws Exception { + public void testIsAvailable_notIfChannelNull() { NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); mController.onResume(appRow, null, null, null); assertFalse(mController.isAvailable()); } @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); @@ -127,7 +117,7 @@ public class SoundPreferenceControllerTest { } @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); @@ -136,7 +126,7 @@ public class SoundPreferenceControllerTest { } @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); @@ -144,7 +134,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testDisplayPreference_savesPreference() throws Exception { + public void testDisplayPreference_savesPreference() { NotificationSoundPreference pref = mock(NotificationSoundPreference.class); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref); mController.displayPreference(mScreen); @@ -154,20 +144,21 @@ public class SoundPreferenceControllerTest { } @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)); - Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + Preference pref = new NotificationSoundPreference(mContext, attributeSet); 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; @@ -175,14 +166,15 @@ public class SoundPreferenceControllerTest { when(channel.getId()).thenReturn(lockedId); mController.onResume(appRow, channel, null, null); - Preference pref = new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + Preference pref = new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); assertFalse(pref.isEnabled()); } @Test - public void testUpdateState_configurable() throws Exception { + public void testUpdateState_configurable() { Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = mock(NotificationChannel.class); @@ -190,8 +182,8 @@ public class SoundPreferenceControllerTest { when(channel.getSound()).thenReturn(sound); mController.onResume(appRow, channel, null, null); - NotificationSoundPreference pref = - new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); + NotificationSoundPreference pref = new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); assertEquals(sound, pref.onRestoreRingtone()); @@ -199,15 +191,16 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceChange() throws Exception { + public void testOnPreferenceChange() { Uri sound = Settings.System.DEFAULT_ALARM_ALERT_URI; NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH); channel.setSound(sound, Notification.AUDIO_ATTRIBUTES_DEFAULT); mController.onResume(appRow, channel, null, null); + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); NotificationSoundPreference pref = - new NotificationSoundPreference(mContext, mock(AttributeSet.class)); + new NotificationSoundPreference(mContext, attributeSet); mController.updateState(pref); mController.onPreferenceChange(pref, Uri.EMPTY); @@ -217,7 +210,7 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceTreeClick_incorrectPref() throws Exception { + public void testOnPreferenceTreeClick_incorrectPref() { NotificationSoundPreference pref = mock(NotificationSoundPreference.class); mController.handlePreferenceTreeClick(pref); @@ -226,9 +219,10 @@ public class SoundPreferenceControllerTest { } @Test - public void testOnPreferenceTreeClick_correctPref() throws Exception { + public void testOnPreferenceTreeClick_correctPref() { + AttributeSet attributeSet = Robolectric.buildAttributeSet().build(); NotificationSoundPreference pref = - spy(new NotificationSoundPreference(mContext, mock(AttributeSet.class))); + spy(new NotificationSoundPreference(mContext, attributeSet)); pref.setKey(mController.getPreferenceKey()); mController.handlePreferenceTreeClick(pref); diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 3510a60eb1fa592fac70512663575a861016d2f1..4f3dce6c22b8ed341db58162efd00e17c89160a4 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -30,20 +30,20 @@ import android.os.UserManager; import android.preference.SeekBarVolumizer; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SoundSettingsTest { @Test @@ -74,7 +74,6 @@ public class SoundSettingsTest { @Test public void onStreamValueChanged_shouldRepostStopSampleMessage() { final SoundSettings settings = new SoundSettings(); - final Handler handler = settings.mHandler; ReflectionHelpers.setField( settings.mVolumeCallback, "mCurrent", mock(SeekBarVolumizer.class)); diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 9bb380df01e5fa8747bcf62a997028afe54da332..a12af4dd60cc60b780f766ef604877441913431b 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -24,15 +24,14 @@ 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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SuppressorHelperTest { private static final String SUPPRESSOR_NAME = "wear"; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index abea4e30b9e734c1bde395eed38105b00411e7e4..91c2a7803b137156f23ba324901c42e471348f92 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -31,17 +31,16 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TouchSoundPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index daf7ffb9e4d30b1f5bd96d4fce069ce0a090490d..2b2f02c73caa1ba294ef4f0946be04f971b7c66d 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -30,16 +30,15 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrateOnTouchPreferenceControllerTest { @Mock @@ -74,7 +73,6 @@ public class VibrateOnTouchPreferenceControllerTest { @Test public void isAvailable_hasHaptic_shouldReturnTrue() { - assertThat(mController.isAvailable()).isTrue(); } diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index aa1824d7d53e022adaf26ffc2b2b2e5dac23861e..7334b452267e7d6fd1caf9d41ea551ee482c6764 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -36,18 +36,17 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrateWhenRingPreferenceControllerTest { private static final String KEY_VIBRATE_WHEN_RINGING = "vibrate_when_ringing"; diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index 69438e221ec18f7450439cda7b75765944f82687..e1d5b73574c9e011c37b8dedbe5ffd897b6b5402 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -21,8 +21,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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -41,7 +41,6 @@ import android.os.Vibrator; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; @@ -51,10 +50,11 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VibrationPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index 8aad02e1a0db14d1ebd2356f92889445c112e401..20454009c663a6c71b3801a6063022655b79de8d 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -24,10 +24,9 @@ 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.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -48,7 +47,6 @@ import android.provider.Settings; import com.android.internal.widget.LockPatternUtils; import com.android.settings.RestrictedListPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictionUtils; import com.android.settingslib.RestrictedLockUtils; @@ -59,6 +57,7 @@ import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -66,7 +65,7 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictionUtils.class) public class VisibilityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 99a97c342e24e03bbbc402569b36a73e254ec05a..a9e74b743069a509d016302414fbd747b3894be4 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.notification; 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.nullable; -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; @@ -30,15 +30,14 @@ import android.content.Context; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumeSeekBarPreferenceControllerTest { @Mock @@ -59,7 +58,7 @@ public class VolumeSeekBarPreferenceControllerTest { MockitoAnnotations.initMocks(this); when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference); when(mPreference.getKey()).thenReturn("key"); - mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, + mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, true, mPreference.getKey()); mController.setAudioHelper(mHelper); } @@ -147,11 +146,6 @@ public class VolumeSeekBarPreferenceControllerTest { private boolean mAvailable; - VolumeSeekBarPreferenceControllerTestable(Context context, - VolumeSeekBarPreference.Callback callback, String key) { - this(context, callback, true, key); - } - VolumeSeekBarPreferenceControllerTestable(Context context, VolumeSeekBarPreference.Callback callback, boolean available, String key) { super(context, key); diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java index 5955aa8521d45f92647fd0b4487cea189beb5e8e..d74f76a7ceadbb5494eb10175d4f49ad1f2694a7 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java @@ -24,15 +24,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.AudioManager; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumeSeekBarPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index 4397e71c653f2eac97ef119bfb96b9f72d6d17d4..d6a594a72b84d0a10fa008ff29b066d2af0d8424 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -39,15 +39,15 @@ import androidx.preference.TwoStatePreference; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; import com.android.settings.RingtonePreference; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WorkSoundPreferenceControllerTest { private static final String KEY_WORK_CATEGORY = "sound_work_settings_section"; @@ -166,7 +166,6 @@ public class WorkSoundPreferenceControllerTest { verify(mWorkCategory).setVisible(false); } - @Test public void displayPreference_isAvailable_shouldShowPreferenceCategory() { when(mAudioHelper.getManagedProfileId(nullable(UserManager.class))) diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java index c902828c9f17b2ccdbab61d5b8674354637c82bb..c2a6f4f892c8ab3b80fce6c1bfce5becb2ca3cb1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java @@ -16,15 +16,14 @@ package com.android.settings.notification; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -32,8 +31,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenAccessSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index c679205ee1e25136921cc4488de70bfec6e4affb..8e53aa6619169bf906962d261091a48c96b9462a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -29,14 +29,14 @@ import android.widget.RadioButton; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenCustomRadioButtonPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index eb89f827a1d2c1283470af8481dc258971306cbd..a6288b3fd41d0d72582f8d1640c173b4ed7c42ee 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenFooterPreferenceControllerTest { private ZenFooterPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index df4df51e857f585d4f38b991ebde46d7bfb34ad0..cfeae7da978fdad48db76e8718c4faf0967ef304 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -38,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @@ -45,7 +45,7 @@ import org.robolectric.util.ReflectionHelpers; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAlarmsPreferenceControllerTest { private static final boolean ALARMS_SETTINGS = true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java index 45f42102e7a6fb6604e4143735510ed2e2ec4ccc..bf3057e45e65ab5070ae55c19b75c3193715b178 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAllBypassingAppsPreferenceControllerTest.java @@ -19,8 +19,6 @@ package com.android.settings.notification; 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; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -28,12 +26,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.ParceledListSlice; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState; import org.junit.Before; @@ -41,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; @@ -50,7 +47,7 @@ import java.util.List; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAllBypassingAppsPreferenceControllerTest { private ZenModeAllBypassingAppsPreferenceController mController; @@ -110,7 +107,7 @@ public class ZenModeAllBypassingAppsPreferenceControllerTest { @Test public void testUpdateNotificationChannelList_emptyChannelsList() { - mController.updateNotificationChannelList(new ArrayList()); + mController.updateNotificationChannelList(new ArrayList<>()); verify(mPreferenceScreen, never()).addPreference(any()); } } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index b431c0a65f286581ed484defdceecd9d003c53ba..5e3d6e9888cacba0c985ea13469af855a2e45618 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -34,21 +34,20 @@ import androidx.fragment.app.Fragment; import androidx.preference.PreferenceCategory; import androidx.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.mockito.internal.util.reflection.FieldSetter; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.HashMap; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeAutomaticRulesPreferenceControllerTest { private ZenModeAutomaticRulesPreferenceController mController; @@ -67,10 +66,10 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mController = spy(new ZenModeAutomaticRulesPreferenceController(mContext, mock(Fragment.class), - null)); + null)); ReflectionHelpers.setField(mController, "mBackend", mBackend); when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( - mockPref); + mockPref); mController.displayPreference(mPreferenceScreen); doReturn(mZenRulePreference).when(mController).createZenRulePreference(any()); } @@ -85,11 +84,11 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { String ruleId3 = "test3_id"; AutomaticZenRule autoRule1 = new AutomaticZenRule("test_rule_1", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); AutomaticZenRule autoRule2 = new AutomaticZenRule("test_rule_2", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); AutomaticZenRule autoRule3 = new AutomaticZenRule("test_rule_3", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 30); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 30); rMap.put(ruleId1, autoRule1); rMap.put(ruleId2, autoRule2); @@ -111,9 +110,9 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { String ruleId2 = "test2_id"; AutomaticZenRule autoRule1 = new AutomaticZenRule("test_rule_1", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); AutomaticZenRule autoRule2 = new AutomaticZenRule("test_rule_2", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 20); rMap.put(ruleId1, autoRule1); rMap.put(ruleId2, autoRule2); @@ -132,7 +131,7 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { Map rMap = new HashMap<>(); String testId = "test1_id"; AutomaticZenRule rule = new AutomaticZenRule("rule_name", null, - null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); + null, Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, true, 10); rMap.put(testId, rule); when(mockPref.getPreferenceCount()).thenReturn(NUM_RULES); @@ -153,4 +152,4 @@ public class ZenModeAutomaticRulesPreferenceControllerTest { rules.entrySet().toArray(arr); when(mBackend.getAutomaticZenRules()).thenReturn(arr); } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java index 94a3c011e16d9421e28c19b8cc79498d18b951e0..3feff0d28b2ea25f125c1b3b792ff08a9dd65b9f 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBackendTest.java @@ -6,16 +6,15 @@ import android.app.AutomaticZenRule; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBackendTest { private static final String GENERIC_RULE_NAME = "test"; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index c4b2b3d0c0f6f4716fb8f5093cca3675bd77b2dc..2c78f2d3bf4d1a54856ba2c51ea7f4d4eef09c88 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -22,7 +22,7 @@ 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.assertTrue; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -43,7 +43,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -51,11 +50,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBehaviorFooterPreferenceControllerTest { private static final String TEST_APP_NAME = "test_app"; @@ -72,8 +72,6 @@ public class ZenModeBehaviorFooterPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @Mock - private ZenModeConfig mConfig; - @Mock private ZenModeConfigWrapper mConfigWrapper; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java index 4bf05efd47e966d922a67891ebe93bbfaa846859..448800f1af18f2be21fdf7ce6becc19f7cdb818b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -32,11 +31,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeBlockedEffectsPreferenceControllerTest { private ZenModeBlockedEffectsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index a3c326138fdb4698265d2dde63ea69505a32f15f..1071b4847f0095202fdfc8439392ada18e3023ce 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -37,7 +37,6 @@ import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,11 +44,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeButtonPreferenceControllerTest { private ZenModeButtonPreferenceController mController; @@ -86,8 +86,7 @@ public class ZenModeButtonPreferenceControllerTest { ReflectionHelpers.setField(mController, "mZenButtonOn", mZenButtonOn); ReflectionHelpers.setField(mController, "mZenButtonOff", mZenButtonOff); - 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/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java index 0bdf6f58aea381b0812d6540134b61bb8a33b6ad..9c27356fa19e674f54133461aed49c2199780af1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBypassingAppsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -32,10 +31,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeBypassingAppsPreferenceControllerTest { private ZenModeBypassingAppsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index fdc43f3fcbd56c8ccd10cdf06a53da9cac3ee987..a25a3937b8cd72830b29d1fde041c44586ce5887 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -33,13 +32,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; import androidx.preference.Preference; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeCallsPreferenceControllerTest { private ZenModeCallsPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index 2d5e54ae23f2c524f6121b7c0cbd8605ca92941e..1488d7998d1665408344c5e4b49dd36bfdbb86ab 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -34,11 +33,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeDurationPreferenceControllerTest { private ZenModeDurationPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java index 9a922ba3a5c57c72a639d4d4c370204430e380a4..502992303eacb93773cf6f7c9939dd1501aa9142 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java @@ -32,24 +32,21 @@ import android.content.res.Resources; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -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; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowToast; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeEventRuleSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index 7d5efa7c0651af6a237a35bc2b45abf0b644f58b..2e54d08b27cde1add2299fa3a7a2784135a75bda 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeEventsPreferenceControllerTest { private static final boolean EVENTS_SETTINGS = true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index 9217f64393af7c97c352327d32f7ef7987d5c424..2489d17462474717dd788e110aef44b743faa7d9 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,12 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeMediaPreferenceControllerTest { private ZenModeMediaPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index 890f6c2afb212a64e866a23728cc6848db297910..5589caefa0fe3ec519843a039189f5bb1849ba9e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -31,11 +30,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class ZenModeMessagesPreferenceControllerTest { private ZenModeMessagesPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 141813b52b1d95eb9ab95802afbd641e1fb13f29..adecd98eafb690eb4b1bff7eb809d2eba992d9fd 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -20,7 +20,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEA import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -34,18 +34,18 @@ import android.content.Context; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java index 7131250442e40d7cb8b75f1122c141e971720d21..6b9f643e6107ed07f8aef29066bf6710f174b4d2 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + +@RunWith(RobolectricTestRunner.class) public class ZenModePriorityCallsPreferenceControllerTest { private ZenModePriorityCallsPreferenceController mController; @@ -94,8 +97,7 @@ public class ZenModePriorityCallsPreferenceControllerTest { mController = new ZenModePriorityCallsPreferenceController(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); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java index 7b6698dc693dd91af8983dbfe4b9580903934030..83bf3e4d1f4ea18064e0bdfc500e4834e76a50ea 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -42,11 +41,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + +@RunWith(RobolectricTestRunner.class) public class ZenModePriorityMessagesPreferenceControllerTest { private ZenModePriorityMessagesPreferenceController mController; @@ -94,8 +97,7 @@ public class ZenModePriorityMessagesPreferenceControllerTest { mController = new ZenModePriorityMessagesPreferenceController(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); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index de20fb4f38b375132ca89dc5e7dad848402bb457..12e6dfdaf9b86a0c38efeacbffb2b66b65a54302 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeRemindersPreferenceControllerTest { private static final boolean REMINDERS_SETTINGS = true; @@ -84,7 +84,6 @@ public class ZenModeRemindersPreferenceControllerTest { mController.displayPreference(mPreferenceScreen); } - @Test public void updateState_TotalSilence() { Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS); diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index fd6a9af1fbfe58eb26c0398feab59563aad64268..6c2ffacda39d2ec040d16dbff2c5cd2be6a05211 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeRepeatCallersPreferenceControllerTest { private static final boolean REPEAT_CALLERS_SETTINGS = true; @@ -79,8 +79,7 @@ public class ZenModeRepeatCallersPreferenceControllerTest { 15); 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/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index ecfb7842c911dfee905a7e9b8a1b1964d081fe3c..46f3019b4c7a51c33c8a96457ab49fa1594665ef 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -32,21 +32,18 @@ import android.content.res.Resources; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -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; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowToast; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeScheduleRuleSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index ca9f94292283dfef6fc4d7abe4f402d15796214a..516d98f1f0a9958b3dd79ec412196f0df97d6818 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -22,7 +22,7 @@ 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.assertTrue; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; @@ -44,7 +44,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -52,11 +51,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSettingsFooterPreferenceControllerTest { private static final String TEST_APP_NAME = "test_app"; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 53032ac789c1fd49320c2c71af4b224d3285c6e8..f899a98cb9e2d45b319429c936d824641ffe0780 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -18,7 +18,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import android.app.NotificationManager; import android.app.NotificationManager.Policy; @@ -26,16 +26,16 @@ import android.content.Context; import android.provider.SearchIndexableResource; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSettingsTest { private ZenModeSettings.SummaryBuilder mBuilder; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index ee513170611542d4d8d636f25f2f7c89b484bdc7..bc9e3707620990e378d31c4615ead27eeec17418 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -33,20 +33,20 @@ import androidx.slice.core.SliceAction; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import com.android.settings.testutils.shadow.ShadowNotificationManager; 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; import java.util.List; @Config(shadows = ShadowNotificationManager.class) -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSliceBuilderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 9e6eb82e8bc1acc7a077ae36f4d41f6ae07ac26d..db551a2f8ff165fd059ecc3b9c834b9d4ddadefc 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -21,7 +21,7 @@ import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,7 +35,6 @@ import android.database.Cursor; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,13 +44,14 @@ 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.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeStarredContactsPreferenceControllerTest { private ZenModeStarredContactsPreferenceController mCallsController; @@ -116,7 +116,6 @@ public class ZenModeStarredContactsPreferenceControllerTest { when(mBackend.getPriorityCallSenders()) .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_ANY); - assertThat(mCallsController.isAvailable()).isFalse(); } @@ -186,7 +185,7 @@ public class ZenModeStarredContactsPreferenceControllerTest { int count = 0; @Override - public Boolean answer(InvocationOnMock invocation) throws Throwable { + public Boolean answer(InvocationOnMock invocation) { if (count < size) { count++; return true; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 57bc303617598a45fcbf810e8c2a402332f3e0e0..0b57b8186ef1b8d9a86ca152192ad751fc77c329 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -33,7 +33,6 @@ import android.provider.Settings; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,11 +40,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeSystemPreferenceControllerTest { private ZenModeSystemPreferenceController mController; @@ -75,8 +75,7 @@ public class ZenModeSystemPreferenceControllerTest { mController = new ZenModeSystemPreferenceController(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); } diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 65c39f8728706656d3c17c33035a47fa756c0db8..0e523dfd29b0ef9734a2e99b22361c0435b24960 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.res.Resources; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.DisabledCheckBoxPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectPreferenceControllerTest { private ZenModeVisEffectPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index 5ae37e37aebcbde83bb255ac2666186fc4f824f5..9d89a9e92d7185ffdc90f9332bf41f1112f573a9 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -41,7 +41,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,11 +48,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsAllPreferenceControllerTest { private ZenModeVisEffectsAllPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index a318a399262f5037e7b4e10ef3efedecc9614ad4..6afd339bd42870852a3e0d6e2c47527306039e31 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -39,7 +39,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,11 +46,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsCustomPreferenceControllerTest { private ZenModeVisEffectsCustomPreferenceController mController; @@ -60,7 +60,6 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { @Mock private ZenCustomRadioButtonPreference mockPref; private Context mContext; - private FakeFeatureFactory mFeatureFactory; @Mock private PreferenceScreen mScreen; @Mock @@ -73,7 +72,7 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { MockitoAnnotations.initMocks(this); ShadowApplication shadowApplication = ShadowApplication.getInstance(); mContext = RuntimeEnvironment.application; - mFeatureFactory = FakeFeatureFactory.setupForTest(); + FakeFeatureFactory.setupForTest(); shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager); when(mNotificationManager.getNotificationPolicy()).thenReturn( mock(NotificationManager.Policy.class)); @@ -97,7 +96,6 @@ public class ZenModeVisEffectsCustomPreferenceControllerTest { assertThat(mController.isAvailable()).isTrue(); } - @Test public void updateState_notChecked_noVisEffects() { mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0); diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index fe45d1c5db220a3d3ba2552ef7d8236165e095cf..e856cca11ce00b9cb57e03d28783e77eb5de3286 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -41,7 +41,6 @@ import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -49,11 +48,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenModeVisEffectsNonePreferenceControllerTest { private ZenModeVisEffectsNonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java index 833d866096050ee5efdb639a4aedc31c9a93a5e4..6cd9430e78e3db17271a630a86f649c602b43d5d 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java @@ -41,7 +41,6 @@ import android.provider.Settings; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -50,18 +49,19 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ZenOnboardingActivityTest { @Mock - MetricsLogger mMetricsLogger; + private MetricsLogger mMetricsLogger; @Mock - NotificationManager mNm; + private NotificationManager mNm; - ZenOnboardingActivity mActivity; + private ZenOnboardingActivity mActivity; private Context mContext; private FakeFeatureFactory mFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java index aae85ababd5b8a9f6524ea0fad2ccfe36ca487b4..3a4cf7b0ba6ecdb4ace8378823e0c52c6b6bfcf5 100644 --- a/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/InternetConnectivityPanelTest.java @@ -22,16 +22,16 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class InternetConnectivityPanelTest { diff --git a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java index 050fd0cd899d3eb42a53dba700bf25181873ad97..754c9379060f81b4956162b0f93ecff2c9c056c0 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelFeatureProviderImplTest { private Context mContext; @@ -48,5 +47,4 @@ public class PanelFeatureProviderImplTest { assertThat(panel).isInstanceOf(InternetConnectivityPanel.class); } - } diff --git a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java index cf344d2283480804083699b951b88de8b4249f55..73318f2ac11605058924395be9826556de99b73c 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java @@ -30,17 +30,17 @@ import android.widget.LinearLayout; import com.android.settings.R; 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.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelFragmentTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java index 02a7d0aa013f0adf48b2b5d58f5655b0c9b893ba..7648d236720e1d2903eb2b7d041aa3bc691b1153 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java @@ -28,7 +28,6 @@ import android.widget.FrameLayout; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.runner.RunWith; @@ -36,10 +35,11 @@ import org.robolectric.Robolectric; import org.junit.Test; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PanelSlicesAdapterTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java index 21019d355b72000aeca662ed1611bda80371016a..11964cd1ab637dc016727a2ca78c959744f65b1d 100644 --- a/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java +++ b/tests/robotests/src/com/android/settings/panel/VolumePanelTest.java @@ -21,16 +21,16 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; import com.android.settings.slices.CustomSliceRegistry; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VolumePanelTest { private VolumePanel mPanel; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index ad530ba5ccb8b40913cd23db2ede370d6efde678..cbc5765ccc5f9ae5f7a5ee976039a3ec3716791c 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.robolectric.RuntimeEnvironment.application; @@ -28,7 +28,6 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import org.junit.After; @@ -37,12 +36,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.regex.Pattern; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ChooseLockGenericControllerTest { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java index b2cd0439c934619beeae26696a9d4b4f0272af8e..e3242148ee49b1623fa587551b7748a8897932f2 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java @@ -32,9 +32,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.search.SearchFeatureProvider; -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.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowStorageManager; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -45,13 +42,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config( shadows = { - SettingsShadowResources.class, - SettingsShadowTheme.class, ShadowLockPatternUtils.class, ShadowStorageManager.class, ShadowUserManager.class, @@ -64,17 +60,13 @@ public class ChooseLockGenericTest { @Before public void setUp() { - Global.putInt( - application.getContentResolver(), - Global.DEVICE_PROVISIONED, 1); + Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1); mFragment = new ChooseLockGenericFragment(); } @After public void tearDown() { - Global.putInt( - application.getContentResolver(), - Global.DEVICE_PROVISIONED, 1); + Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1); ShadowStorageManager.reset(); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 6e3e4294cd3596b417a4669378aa504bdd32b687..367cb4c36b206eb5d5bf465b00a175859f925483 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -28,9 +28,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; 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.ShadowUtils; import com.google.android.setupdesign.GlifLayout; @@ -40,21 +38,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowDrawable; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class, ShadowUtils.class}) public class ChooseLockPasswordTest { @Before - public void setUp() throws Exception { + public void setUp() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_headlineFontFamily, ""); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index 352e2c43807bff188ed74391aa281a4938f6a56d..a6a6355799b3a9eb42039d1adff4eefc2cfbfeeb 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -27,9 +27,6 @@ import android.view.View; import com.android.settings.R; 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.ShadowUtils; import com.android.settingslib.testutils.DrawableTestHelper; @@ -38,15 +35,11 @@ import com.google.android.setupdesign.GlifLayout; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = 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 12b0ebfd3bd33d24e65dd70b5afcbef1920e5af9..64e19155294e7a12964e7fba8b2d9f3c9f3032fa 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -5,7 +5,7 @@ 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; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -16,7 +16,6 @@ import android.content.Intent; import android.os.UserHandle; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -26,12 +25,13 @@ import com.google.android.setupdesign.util.ThemeHelper; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity.IntentForResult; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowUtils.class}) public class ChooseLockSettingsHelperTest { @@ -61,14 +61,12 @@ public class ChooseLockSettingsHelperTest { ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false)); assertEquals(10000L, startedIntent.getLongExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L)); - assertEquals( - true, - (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); + assertTrue((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); - assertEquals(true, startedIntent.getBooleanExtra( + assertTrue(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)); } @@ -97,14 +95,12 @@ public class ChooseLockSettingsHelperTest { ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false)); assertEquals(10000L, startedIntent.getLongExtra( ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L)); - assertEquals( - false, - (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); + assertFalse((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)); assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false)); - assertEquals(false, startedIntent.getBooleanExtra( + assertFalse(startedIntent.getBooleanExtra( ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false)); } diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java index 3b38a561f7714e6b5711fbfabe272bd1a091d4f2..195c82d0089b423f8e66d284c60c5a67cc3ef8ec 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java @@ -18,7 +18,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -32,19 +32,18 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; 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; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class ChooseLockTypeDialogFragmentTest { private Context mContext; @@ -61,8 +60,7 @@ public class ChooseLockTypeDialogFragmentTest { @Test public void testThatDialog_IsShown() { AlertDialog latestDialog = startLockFragment(); - ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf( - latestDialog); + ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(latestDialog); assertThat(latestDialog).isNotNull(); assertThat(latestDialog.isShowing()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java index aa23005b80a690dd7c5401034a2aa00b05a1ee84..94bb4e8bb7eef85b65714a7a36b8bda48d83d139 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -22,16 +22,13 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.annotation.Config; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.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 5fa3edb81b1c05b9d5759213e3b9876acf8df5b1..05c3f64428751b8be4413927f1217c442ad32db2 100644 --- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java +++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.app.admin.DevicePolicyManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 fd1c56211955c7a639327e9c736a7a4bb0b56aed..99738e75c3343c6d0aece07ed2eb6b75ecfbead7 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -23,18 +23,17 @@ import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowActivity; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SetNewPasswordActivityTest { private int mProvisioned; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index 67f7b0adc5efa95055b0419dd067ee8834b9f4fb..b579347ebdebe9f17fb0746dcf21d04a91f70456 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -32,8 +32,8 @@ 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -45,16 +45,15 @@ import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class SetNewPasswordControllerTest { private static final int CURRENT_USER_ID = 101; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index e586958c2d4eca0270a6c4432aea6d499514c897..0a08319e085e69a35b9ed277c8e0ab0f82d1994c 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -31,15 +31,14 @@ import com.android.settings.R; 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.ShadowUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -51,17 +50,12 @@ import org.robolectric.shadows.ShadowDialog; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.class, - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {SettingsShadowResources.class, ShadowUtils.class}) public class SetupChooseLockPasswordTest { @Before - public void setUp() throws Exception { + public void setUp() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_headlineFontFamily, ""); } @@ -148,7 +142,7 @@ public class SetupChooseLockPasswordTest { @Implements(ChooseLockGenericController.class) public static class ShadowChooseLockGenericController { @Implementation - public List getVisibleScreenLockTypes(int quality, + protected List getVisibleScreenLockTypes(int quality, boolean includeDisabled) { return Collections.emptyList(); } diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index 0dcd31baacfc7e00180b2c04873ebea3dbaaa1a2..c11d7ebadb80b9c8847083773620a1bca6da2844 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -37,15 +37,13 @@ import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; 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.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -55,13 +53,8 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter; import java.util.Arrays; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResourcesImpl.class, - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupChooseLockPatternTest { private SetupChooseLockPattern mActivity; diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index 0e4e5dca57db394d66a76f0b5e765e41cf82011b..a769048d15552b82408437b1f9f79fef21068e59 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -22,9 +22,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -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.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; @@ -32,15 +29,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, - ShadowUtils.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class}) public class SetupSkipDialogTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java index 50dd38b183b5683ec228e784fa91d8d09f0e9bf3..96036d5275583c88623443d9645d8ca23d7b449a 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobMessagePreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -44,9 +43,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrintJobMessagePreferenceControllerTest { private static final String PREF_KEY = "print_job_message_preference"; diff --git a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java index fc92eb3cc8f1bff1c527861ef4cc657eda31477e..09c5bf368af067d5af6cafcab409a5826fea11ba 100644 --- a/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintJobPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,7 +37,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,9 +44,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PrintJobPreferenceControllerTest { private static final String PREF_KEY = "print_job_preference"; @@ -67,7 +67,6 @@ public class PrintJobPreferenceControllerTest { private Preference mPreference; private String mTestLabel; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 51988ff975e18ed14559111b8a82395ad9bdf01f..69db28fe24df02cc9a1a71756eb7cb398fd83b9a 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -36,7 +36,6 @@ import android.printservice.PrintServiceInfo; import androidx.lifecycle.LifecycleOwner; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -46,13 +45,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 0b3ea9cba967854a32888919f4d5509eb02b327b..5e5e5731758530473642fc5585c4589f5dbee728 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -27,13 +27,13 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; 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; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BaseSearchIndexProviderTest { private static final String TEST_PREF_KEY = "test_pref_key"; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index 37fd88801d26da7af970ab86aaa75762d2af70a5..7f709d6fb9b6c5842e764421a313d59b44506370 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -29,18 +29,18 @@ import android.widget.Toolbar; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SearchFeatureProviderImplTest { private SearchFeatureProviderImpl mProvider; @@ -78,8 +78,7 @@ public class SearchFeatureProviderImplTest { final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity(); - assertThat(launchIntent.getAction()) - .isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS); + assertThat(launchIntent.getAction()).isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS); } @Test diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 7cea11f61a58e3a2ab2274602c8e70727e6b0c7b..ff2acdc307beb8db83d51f63fcbc598d99249937 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -20,7 +20,7 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXAB import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.fail; +import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,16 +31,16 @@ import android.text.TextUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wifi.WifiSettings; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SearchIndexableResourcesTest { private SearchFeatureProviderImpl mSearchProvider; diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index e3ef15e91745c621ba145f985a197d7bceaf2285..2a8407bd16a5b5632f746fd9249715f3a2984d22 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -13,19 +13,19 @@ import android.provider.SearchIndexablesContract; import com.android.settings.R; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSearchIndexablesProviderTest { private static final String BASE_AUTHORITY = "com.android.settings"; 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 b4076b5226b83d0133a5d8ece1ec55711d3ba6ad..af1a82de90591aea6a3f3d0c0935df6532955470 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -29,7 +29,6 @@ import android.view.Menu; import android.view.MenuItem; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.lifecycle.ObservableFragment; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; @@ -39,10 +38,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class SearchMenuControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java index fda5942b212dbb48f6d9eaa314ca23bdf6f73c8d..9913e554b4d52228e7912a27a895281b055fd72b 100644 --- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java @@ -36,7 +36,6 @@ import androidx.preference.PreferenceViewHolder; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.GearPreference; @@ -45,10 +44,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ChangeScreenLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java index fe7c5594c425f41783514316a9bc901a5d934687..49a4e92ae434b8854c161e9bf578545804837c82 100644 --- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java +++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java @@ -22,14 +22,12 @@ import static org.mockito.Mockito.verify; import android.content.DialogInterface; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.androidx.fragment.FragmentController; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.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 ebe420512be420db3dca354fdb76f29135235fcf..3eb21cf1caa92109be35a09bf960ce34275da068 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -23,16 +23,16 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowKeyStore; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowKeyStore.class) public class CredentialStoragePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 6a5848215f9781942aa84aa9e1cf49ba9aab97bd..6f326ce662768fb3dc128f199533e6ac192c9137 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -29,20 +29,20 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EncryptionAndCredentialTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index c7fdeae5bc162c767c8d660b58c54aa917f50d81..9f0e115f0f3f93f7f24539e11f8140793188058b 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -28,18 +28,17 @@ import android.content.Context; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class}) public class EncryptionStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index f8d17a8f0543f6c526424c5f56aca1006eac099a..be5593ff97fe621d2e31a8624d5a20015e20df68 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -29,17 +29,17 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockUnificationPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index f0bda6e55031b02d4e064006077ccbfff2c30139..5b6b3464b4c4eb8e040c40cbd46409635333e4bd 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -17,7 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,17 +27,17 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockdownButtonPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java index 7e8c0d52202512e7c18ccd8464f998056196f4c0..2db36b7320e96429ecfa3f8bb0ea6ec8257466a6 100644 --- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java @@ -33,7 +33,6 @@ import com.android.settings.display.AmbientDisplayNotificationsPreferenceControl import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUtils; @@ -44,15 +43,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowUtils.class, ShadowLockPatternUtils.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUtils.class, ShadowLockPatternUtils.class}) public class LockscreenDashboardFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 7ec86113ae3b204597b52baae1bb206d7aed69b1..c4729227b5629817e879b09781bcbc0e9a795b69 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -17,9 +17,9 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,7 +36,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.users.OwnerInfoSettings; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedPreference; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class OwnerInfoPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 8c7eaa54181da11b1a4ada68d069a173b8693f24..79ece904dbb2c8c7a186fcf72dd6ee016a1de66a 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -23,18 +23,17 @@ import android.os.UserManager; import androidx.lifecycle.LifecycleOwner; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class RestrictedEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index 1851ed52afbd2947df45f0909eb9152beaaf5bcd..9b041d4cc48792213071dad587e1f42082322ef4 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -25,17 +25,17 @@ import android.provider.Settings; import androidx.preference.Preference; import com.android.settings.R; -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.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenPinningPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java index 829210d6bcfe4b77dc874894c5a277b33a139533..8dc0db5936159f359ff0dc3da4d4c315a09a9954 100644 --- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java @@ -22,15 +22,15 @@ import android.content.Context; import com.android.internal.widget.LockPatternUtils; import com.android.settings.security.trustagent.TrustAgentManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SecurityFeatureProviderImplTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 6b968e6f195da5a10852ab41bd8f3e53c0406f76..5e3c27aa35d5939aedb45b51217805e27dbdaba9 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -31,17 +31,17 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShowPasswordPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index f20587db2ea8fd903ebc74ae09a15ec35f2a394a..07d8ac55cdf56910f7442e95dd1bad616910730a 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -36,20 +36,20 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SimLockPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java index 17ba6d5f3f245e0c4aa7dc2890f364c548f3daaf..4e18a3eb12cbc88a2b4efaf3a185e0d854c58456 100644 --- a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java @@ -25,7 +25,6 @@ import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TopLevelSecurityPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 08fdd7d5e5165ca1e27c74f31f73f56c562e4d5c..e474b2bf6aa5c215b8f2e24061b61f3e196514e8 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -38,7 +38,6 @@ import androidx.lifecycle.LifecycleOwner; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VisiblePatternProfilePreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; 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 8f05f74e96d6b0f764463a6a1876fdb4818a35b6..d2adaad3aa8ca58013c3902e6c9f1d39298589f1 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -35,7 +35,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.display.TimeoutListPreference; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import org.junit.Before; @@ -43,12 +42,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowDevicePolicyManager.class) public class LockAfterTimeoutPreferenceControllerTest { 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 d89e6b0c8a0b22c3b85d0c181cf98f1eeb34b5f6..45d029589ac81045ef3c18a90d866fdc652adc11 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,10 +46,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LockScreenPreferenceControllerTest { private static final int FAKE_PROFILE_USER_ID = 1234; @@ -69,7 +69,6 @@ public class LockScreenPreferenceControllerTest { private LockScreenPreferenceController mController; private Preference mPreference; - @Before public void setUp() { MockitoAnnotations.initMocks(this); 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 9d7a5071bf46a782e5d569860c4bb3523c476e74..df6818b1da19b0e3797311ad60dc41dce173e68f 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -27,16 +27,16 @@ import android.content.Context; import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PatternVisiblePreferenceControllerTest { private static final int TEST_USER_ID = 0; 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 028145584d1b249b8d754dea49c9744ee1660d7a..7c44561a1f6a424caa31407415dd370b0ade521f 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -30,16 +30,16 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class PowerButtonInstantLockPreferenceControllerTest { private static final int TEST_USER_ID = 0; 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 6d378ef3d8907090657e000fbb11c10ac5235417..2c93fc204fd446dad5f29cadaa190787be336d75 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -24,19 +24,19 @@ import static org.mockito.Mockito.verify; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.security.OwnerInfoPreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; import java.util.Map; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScreenLockSettingsTest { private ScreenLockSettings mSettings; 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 07269bf644837b5f2a9f2ef44b3be8ecf4c393ce..9be374c066b28acbbe804e59809393e945b6a11e 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -29,20 +29,20 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ManageTrustAgentsPreferenceControllerTest { @Mock 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 509fae4f328a516918c07a737539f3f6a39435c0..d9202d437f56b06469891bfc9baa1305000c55d4 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -43,7 +43,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.security.SecuritySettings; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -52,12 +51,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TrustAgentListPreferenceControllerTest { @Mock 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 668734e14d2865ffff077f618616aff878843207..7796dc3d4fb6c09b6feb2c21d4f6706c58d58d82 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -24,15 +24,14 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; 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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TrustAgentManagerTest { private static final String CANNED_PACKAGE_NAME = "com.test.package"; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java index ede6a8f12fca668d4c80aa3e3c1f47b52057f9dc..7eb64b95b48529ba7035c2badac051baafc7f3e9 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; @@ -42,6 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -52,7 +52,7 @@ import org.robolectric.shadows.ShadowApplicationPackageManager; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowLockPatternUtils.class, ShadowRestrictedLockUtilsInternal.class, @@ -214,17 +214,14 @@ public class TrustAgentsPreferenceControllerTest { @Implementation public boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm) { - if (sPermissionGrantedList.contains(resolveInfo)) { - return true; - } - return false; + return sPermissionGrantedList.contains(resolveInfo); } - public static void grantPermissionToResolveInfo(ResolveInfo rInfo) { + private static void grantPermissionToResolveInfo(ResolveInfo rInfo) { sPermissionGrantedList.add(rInfo); } - public static void clearPermissionGrantedList() { + private static void clearPermissionGrantedList() { sPermissionGrantedList.clear(); } } diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java index adcd184eec29e011e262d1d124f73a325e4d396a..e132aac2f45a144529b2e65c2968bb9e2426df8f 100644 --- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java @@ -38,7 +38,6 @@ import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; @@ -47,6 +46,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -58,7 +58,7 @@ import java.util.List; /** * Tests for {@link CreateShortcutPreferenceController} */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class CreateShortcutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java index 4b40e477384f9db4e2659037e7ba75aad1864c01..0bc041424f6411235c745fac738919560b2bd362 100644 --- a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java +++ b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java @@ -38,7 +38,6 @@ import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; import com.android.settings.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -47,6 +46,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowPackageManager; @@ -54,7 +54,7 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.Arrays; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ShortcutsUpdateTaskTest { private Context mContext; @@ -113,7 +113,6 @@ public class ShortcutsUpdateTaskTest { return makeShortcut(SHORTCUT_ID_PREFIX + cn.flattenToShortString()); } - private ShortcutInfo makeShortcut(String id) { return new ShortcutInfo.Builder(mContext, id).build(); } diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 8e3c1c8d4d52c36956878a7e6f09a63a518ee28e..b1292677898c1aea96bd27482d494dd7fb3ea6a8 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -50,7 +50,6 @@ import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeToggleController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowThreadUtils; @@ -65,6 +64,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -85,7 +85,7 @@ import java.util.Set; /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowThreadUtils.class, ShadowUtils.class, SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class, ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class, @@ -512,7 +512,7 @@ public class SettingsSliceProviderTest { } @Implementation - public void close() { + protected void close() { mWifiTracker.onDestroy(); } @@ -545,11 +545,12 @@ public class SettingsSliceProviderTest { } @Test + @Config(qualifiers = "mcc998") public void grantWhitelistedPackagePermissions_noWhitelist_shouldNotGrant() { final List uris = new ArrayList<>(); uris.add(Uri.parse("content://settings/slice")); - mProvider.grantWhitelistedPackagePermissions(mContext, uris); + SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris); verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class)); } @@ -560,7 +561,7 @@ public class SettingsSliceProviderTest { final List uris = new ArrayList<>(); uris.add(Uri.parse("content://settings/slice")); - mProvider.grantWhitelistedPackagePermissions(mContext, uris); + SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris); verify(mManager) .grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0)); @@ -616,11 +617,11 @@ public class SettingsSliceProviderTest { } @Implementation - public static void setThreadPolicy(final StrictMode.ThreadPolicy policy) { + protected static void setThreadPolicy(final StrictMode.ThreadPolicy policy) { sSetThreadPolicyCount++; } - public static boolean isThreadPolicyOverridden() { + private static boolean isThreadPolicyOverridden() { return sSetThreadPolicyCount != 0; } } diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index bd59179b2b661d0f7d52511fc5a817de1a7b2e89..74f4ac2536af279c7e00d6ff111b0e29038d6696 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -48,15 +48,15 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 821d383099206619e02bcb55ee2640f598f8a172..2d893a678361fee0b205490cabff69e05ec47e5c 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -46,15 +46,15 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; import com.android.settings.testutils.FakeUnavailablePreferenceController; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceBuilderUtilsTest { private final String KEY = "KEY"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 83c35bac58c46058557b8f0303cdf648aebc6b87..b935e762c14b9376400a43e63cc904c148912539 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -37,19 +37,19 @@ import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceDataConverterTest { private static final String FAKE_KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java index 9adee0765a32795b3241aa5c5964f5a25af30830..579af1fbee048ba3e517254e75be674d3fd01e5f 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java @@ -20,12 +20,11 @@ import static com.google.common.truth.Truth.assertThat; import android.net.Uri; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceDataTest { private final String KEY = "KEY"; diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java index 5a47e1363c4f83236f2176e334dff83c3334d41f..4efaa19f2a1aef5d09de2500e7524ec2bfa764e2 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java @@ -29,15 +29,15 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.SliceBroadcastRelay; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SliceRelayReceiverTest { private Context mContext; @@ -68,6 +68,5 @@ public class SliceRelayReceiverTest { mSliceRelayReceiver.onReceive(mContext, intent); verify(resolver).notifyChange(eq(uri), any()); - } } diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index f628c87b39dd6c19d010b1fe318d175b09f9c1a6..f4b68a57781cc6699575bf76817a3d84d8a1eec8 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -34,7 +34,6 @@ import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeIndexProvider; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; @@ -44,6 +43,7 @@ import org.junit.After; 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; import org.robolectric.annotation.Implementation; @@ -55,8 +55,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; - -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowUtils.class, SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class, ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class}) diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index a00d343f8fbebf7f2a7a6e2a73cc633079445e95..2bc344312eb879804563f9d50a811500645b2cc8 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -28,17 +28,17 @@ import android.database.sqlite.SQLiteDatabase; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.testutils.DatabaseTestUtils; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SlicesDatabaseHelperTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java index 4602711a121a43cc6791e8f893f47c4d07862d26..827c3f66b3a47110556e5af1321424f88b167d8b 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java @@ -29,18 +29,18 @@ import android.net.Uri; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.testutils.DatabaseTestUtils; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SlicesIndexerTest { private final String[] KEYS = new String[]{"key1", "key2", "key3"}; diff --git a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java index 501c564782a146fae132efb49170c1430dfce9bd..82726dff70de80c7ef458824801fe64c65dc60f3 100644 --- a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java @@ -30,14 +30,13 @@ import android.provider.SettingsSlicesContract; import androidx.slice.Slice; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SpecialCaseSliceManagerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 3ce21055372b26b8d32bf3686ed2ef2a3b1f9972..54a79f4dfe367968e0606dde3594dc54cd26097e 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -46,11 +46,10 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.bluetooth.Utils; import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.BluetoothEventManager; @@ -65,6 +64,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; @@ -75,10 +75,9 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -131,7 +130,7 @@ public class AudioOutputSwitchPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); @@ -175,7 +174,7 @@ public class AudioOutputSwitchPreferenceControllerTest { @Test public void constructor_notSupportBluetooth_shouldReturnBeforeUsingLocalBluetoothManager() { ShadowBluetoothUtils.reset(); - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable( mContext, TEST_KEY); diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 5745efdd993a9f76e2e6a8c523a2acc11af4c828..401014572cd01a618d50d3bd350898c31bebd20c 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -40,10 +40,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; @@ -56,6 +55,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowBluetoothDevice; @@ -63,10 +63,9 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -121,7 +120,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index 9a0c2eeafc018afccb528c9cd875c0db9d796441..8c7faefd5c7e01c61c811dfcfa9bbf62d244f363 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -41,10 +41,9 @@ import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.bluetooth.Utils; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; -import com.android.settings.testutils.shadow.ShadowMediaRouter; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.HearingAidProfile; @@ -57,6 +56,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowBluetoothDevice; @@ -64,10 +64,9 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, - ShadowMediaRouter.class, ShadowBluetoothUtils.class, ShadowBluetoothDevice.class} ) @@ -122,7 +121,7 @@ public class MediaOutputPreferenceControllerTest { mShadowAudioManager = ShadowAudioManager.getShadow(); ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager; - mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext); + mLocalBluetoothManager = Utils.getLocalBtManager(mContext); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index 54bff58b86b9638a1b468c80f9aaa8ac1670264b..0c4ad7c5c70528de14eaee6dc9dacb41fd04cd28 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -24,22 +24,21 @@ 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.Settings; import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity; import com.android.settings.notification.ZenSuggestionActivity; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SettingsSuggestionsTest { @Test @@ -103,19 +102,10 @@ public class SettingsSuggestionsTest { throw new RuntimeException(e); } - final String pName = context.getPackageName(); - final Resources resources = context.getResources(); + final int titleResourceId = (int) info.metaData.get("com.android.settings.title"); + assertThat(titleResourceId).isEqualTo(titleRes); - 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); + final int summaryResourceId = (int) info.metaData.get("com.android.settings.summary"); + assertThat(summaryResourceId).isEqualTo(summaryRes); } } diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java index 44e4f2be0bac102435350bd94bae24ac693c485e..52d2f012c1dc96f74bc150bf73342a41c667ce9e 100644 --- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java @@ -19,13 +19,13 @@ 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 org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 bff4fc0e86be72c3220d4dbb3bf98f5eb0082d9b..dabe9ca65323dc852de7694e972ecf7058940879 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java @@ -25,16 +25,16 @@ import android.content.pm.ResolveInfo; import com.android.settings.R; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SupportDashboardActivityTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java index d8050472aee2a2ccf4a0b2d601cb4d3854db4a09..735dd34f37236e87a1eb34b17b22d4e803a88870 100644 --- a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java @@ -28,15 +28,15 @@ import android.app.Activity; import androidx.preference.Preference; 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.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SupportPreferenceControllerTest { @@ -74,5 +74,4 @@ public class SupportPreferenceControllerTest { assertThat(controller.handlePreferenceTreeClick(mPreference)).isTrue(); verify(mFeatureFactory.supportFeatureProvider).startSupport(mActivity); } - } 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 b0abf6dfeea7a4bd569fd3d7a5622de5d35fa717..8cd26da1ffe84f6f3f72caef8bc2b30e9f4480b7 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 static org.mockito.Mockito.verify; import android.content.Context; import android.os.Bundle; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; import org.junit.Before; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HelpMenuControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index f49967a7be6cc24763bf945987aea1c6ce33e861..0962d299b4f73e6d7df3258300740b12a9ac3d3f 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -2,8 +2,8 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -19,7 +19,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -27,13 +26,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.HashMap; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SurveyMixinTest { private static final String FAKE_KEY = "fake_key"; diff --git a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java index a1473a7a6a38f365ed18ee2d841ec5841fb271e8..0abfc20b59c4e947880506e6b124cf676c996daf 100644 --- a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java @@ -19,16 +19,15 @@ import static com.google.common.truth.Truth.assertThat; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 542a4a1bab10224cc8c42f755f9626760fcdf773..d25148072ff0995c76f568b55c1d1b9b3c747863 100644 --- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUtils; @@ -28,10 +27,11 @@ import org.junit.After; 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(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class FactoryResetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java index 3869903c887696893429668b8a3b899c46140476..1aca4db9e62a03d62b534ba8903b5d10869bc9fa 100644 --- a/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/ResetPreferenceControllerTest.java @@ -19,16 +19,15 @@ import static com.google.common.truth.Truth.assertThat; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ResetPreferenceControllerTest { private static final String KEY_RESET_DASHBOARD = "reset_dashboard"; diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java index 2785c66266e588285f64436d040195ce6ebe5ac2..75cd552ab01fe8741796a09edbdc011003af2d03 100644 --- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -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; @@ -29,12 +28,13 @@ import org.junit.After; 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; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {SettingsShadowResources.class, ShadowUserManager.class}) public class SystemDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index bd17fd72aee4804b621681e8d7dfd4ee7de288e9..fbd87c96f5f896bbe34783227ea84acf2b3f391b 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -34,7 +34,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import org.junit.After; @@ -43,6 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class SystemUpdatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java index eed20099d40a31a748d856734f86877d9c971e26..e4e26d2c531818ee90f9579f9c328a498315feb3 100644 --- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java @@ -19,8 +19,6 @@ package com.android.settings.testutils; import android.content.Intent; import android.os.BatteryManager; -import java.lang.reflect.Field; - public class BatteryTestUtils { public static Intent getChargingIntent() { @@ -39,7 +37,7 @@ public class BatteryTestUtils { BatteryManager.BATTERY_STATUS_DISCHARGING); } - public static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) { + private static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) { Intent intent = new Intent(); intent.putExtra(BatteryManager.EXTRA_PLUGGED, plugged); intent.putExtra(BatteryManager.EXTRA_LEVEL, level); @@ -48,16 +46,4 @@ public class BatteryTestUtils { return intent; } - - public static void clearStaticInstance(Class clazz, String fieldName) { - Field instance; - try { - instance = clazz.getDeclaredField(fieldName); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } - } - } diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java index 84eaae2f6692f0301d9facd6df3b44285f5e4cdc..1a069aafdb51be1f1299f9edf7550a771f843ed0 100644 --- a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java @@ -22,7 +22,7 @@ import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; import com.android.settings.slices.SlicesDatabaseHelper; -import java.lang.reflect.Field; +import org.robolectric.util.ReflectionHelpers; public class DatabaseTestUtils { @@ -36,41 +36,17 @@ public class DatabaseTestUtils { SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(context); helper.close(); - Field instance; - Class clazz = SlicesDatabaseHelper.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(SlicesDatabaseHelper.class, "sSingleton", null); } private static void clearAnomalyDb(Context context) { AnomalyDatabaseHelper helper = AnomalyDatabaseHelper.getInstance(context); helper.close(); - Field instance; - Class clazz = AnomalyDatabaseHelper.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(AnomalyDatabaseHelper.class, "sSingleton", null); } private static void clearAnomalyDbManager() { - Field instance; - Class clazz = BatteryDatabaseManager.class; - try { - instance = clazz.getDeclaredField("sSingleton"); - instance.setAccessible(true); - instance.set(null, null); - } catch (Exception e) { - throw new RuntimeException(); - } + ReflectionHelpers.setStaticField(BatteryDatabaseManager.class, "sSingleton", null); } } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java index a02377cf268cd8a354b84fa7434c9e64ebbac26c..ac19dd0c778880d393ec7db850e7955c49575af1 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java @@ -21,8 +21,7 @@ import android.content.Context; import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.CopyableSlice; -public class FakeCopyableController extends BasePreferenceController implements - CopyableSlice { +public class FakeCopyableController extends BasePreferenceController implements CopyableSlice { public FakeCopyableController(Context context, String preferenceKey) { super(context, preferenceKey); diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index bb475f3831220658e07ed0435d6c55d3edc639d1..ef07fd4a8802328dc650cf39af28a4cc79685370 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -15,7 +15,7 @@ */ package com.android.settings.testutils; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java index c9177e1c5ddaa6838bc9083a8591f56336d6ace6..dce039a2d2a74d08ce49ef1ccbe2ebb794653cfb 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java @@ -50,5 +50,4 @@ public class FakeIndexProvider implements Indexable { return result; } }; - } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java index ca306dad8ff531c2f5732adbc7786cb794924695..9e659130d704268adc8323cdf130aa0793db850f 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeSliderController.java @@ -23,24 +23,24 @@ import com.android.settings.core.SliderPreferenceController; public class FakeSliderController extends SliderPreferenceController { - private final String settingKey = "fake_slider_key"; - public static final String AVAILABILITY_KEY = "fake_slider_availability_key"; public static final int MAX_STEPS = 9; + private static final String SETTING_KEY = "fake_slider_key"; + public FakeSliderController(Context context, String key) { super(context, key); } @Override public int getSliderPosition() { - return Settings.System.getInt(mContext.getContentResolver(), settingKey, 0); + return Settings.System.getInt(mContext.getContentResolver(), SETTING_KEY, 0); } @Override public boolean setSliderPosition(int position) { - return Settings.System.putInt(mContext.getContentResolver(), settingKey, position); + return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY, position); } @Override @@ -50,8 +50,7 @@ public class FakeSliderController extends SliderPreferenceController { @Override public int getAvailabilityStatus() { - return Settings.Global.getInt(mContext.getContentResolver(), - AVAILABILITY_KEY, AVAILABLE); + return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, AVAILABLE); } @Override diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java index 8e408f00729fdbedf0f4b608a8aba31af5f66e34..d1677cd73820ef179d23613007d25c5317bd8e15 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java @@ -26,15 +26,15 @@ import com.android.settings.core.TogglePreferenceController; public class FakeToggleController extends TogglePreferenceController { - private String settingKey = "toggle_key"; - public static final String AVAILABILITY_KEY = "fake_toggle_availability_key"; public static final IntentFilter INTENT_FILTER = new IntentFilter( WifiManager.WIFI_AP_STATE_CHANGED_ACTION); - private final int ON = 1; - private final int OFF = 0; + private static final String SETTING_KEY = "toggle_key"; + + private static final int ON = 1; + private static final int OFF = 0; private boolean mIsAsyncUpdate = false; @@ -45,12 +45,12 @@ public class FakeToggleController extends TogglePreferenceController { @Override public boolean isChecked() { return Settings.System.getInt(mContext.getContentResolver(), - settingKey, OFF) == ON; + SETTING_KEY, OFF) == ON; } @Override public boolean setChecked(boolean isChecked) { - return Settings.System.putInt(mContext.getContentResolver(), settingKey, + return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY, isChecked ? ON : OFF); } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java index eef4761ecb48f609cc2df933da1a604c0a8d55b9..658a81caa26376369c20b3906bfdfdf0298b9c38 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java @@ -15,8 +15,7 @@ public class FakeUnavailablePreferenceController extends BasePreferenceControlle @Override public int getAvailabilityStatus() { - return Settings.Global.getInt(mContext.getContentResolver(), - AVAILABILITY_KEY, 0); + return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, 0); } @Override diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 6a177950c0ded882e9aa5c3707c02c6d1eb0d664..0828cc78b651306fc2568aef1407cfd5721db5d7 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * 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. @@ -13,100 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.android.settings.testutils; import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.robolectric.manifest.AndroidManifest; -import org.robolectric.res.Fs; -import org.robolectric.res.ResourcePath; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; -/** - * Custom test runner for the testing of BluetoothPairingDialogs. This is needed because the - * default behavior for robolectric is just to grab the resource directory in the target package. - * We want to override this to add several spanning different projects. - */ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { - /** - * We don't actually want to change this behavior, so we just call super. - */ public SettingsRobolectricTestRunner(Class testClass) throws InitializationError { super(testClass); } - - /** - * We are going to create our own custom manifest so that we can add multiple resource - * paths to it. This lets us access resources in both Settings and SettingsLib in our tests. - */ - @Override - protected AndroidManifest getAppManifest(Config config) { - try { - // Using the manifest file's relative path, we can figure out the application directory. - final URL appRoot = new URL("file:packages/apps/Settings/"); - final URL manifestPath = new URL(appRoot, "AndroidManifest.xml"); - final URL resDir = new URL(appRoot, "tests/robotests/res"); - final URL assetsDir = new URL(appRoot, "tests/robotests/assets"); - - // By adding any resources from libraries we need the AndroidManifest, we can access - // them from within the parallel universe's resource loader. - return new AndroidManifest(Fs.fromURL(manifestPath), Fs.fromURL(resDir), - Fs.fromURL(assetsDir), "com.android.settings") { - @Override - public List getIncludedResourcePaths() { - final List paths = super.getIncludedResourcePaths(); - addIncludedResourcePaths(paths); - return paths; - } - }; - } catch (MalformedURLException e) { - throw new RuntimeException("SettingsRobolectricTestRunner failure", e); - } - } - - public static void addIncludedResourcePaths(List paths) { - try { - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:packages/apps/Settings/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/RestrictedLockUtils/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SearchWidget/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/ActionButtonsPreference/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:external/setupcompat/main/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:external/setupdesign/main/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/target/common/obj/JAVA_LIBRARIES/robolectric_android-all-stub_intermediates/classes/raw-res/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/extras/material-design-x/com.google.android.material_material-nodeps/android_common/aar/res/")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null)); - paths.add(new ResourcePath(null, - Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.preference_preference-nodeps/android_common/aar/res")), null)); - } catch (MalformedURLException e) { - throw new RuntimeException("SettingsRobolectricTestRunner failure", e); - } - } } diff --git a/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java b/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java deleted file mode 100644 index cfba1e1988c5ccae681c58dc8ae73c4c6836d2ad..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/ShadowIconDrawableFactory.java +++ /dev/null @@ -1,35 +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; - -import android.content.pm.ApplicationInfo; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.IconDrawableFactory; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(IconDrawableFactory.class) -public class ShadowIconDrawableFactory { - - @Implementation - public Drawable getBadgedIcon(ApplicationInfo appInfo) { - return new ColorDrawable(Color.BLUE); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java deleted file mode 100644 index 124b5ead8a4978357c06a51dd93cb08847a31eef..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java +++ /dev/null @@ -1,41 +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.bluetooth.BluetoothDevice; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(BluetoothDevice.class) -public class SettingsShadowBluetoothDevice { - private String mAddress; - - public void __constructor__(String address) { - mAddress = address; - } - - @Implementation - public String getAddress() { - return mAddress; - } - - @Implementation - public int hashCode() { - return mAddress.hashCode(); - } -} 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 c673508735075a2e63c9981ec4e3d554d0b76cfa..b68a4ee2b9342b6278c03930eb171fa8f7763415 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,37 +1,19 @@ package com.android.settings.testutils.shadow; -import static android.util.TypedValue.TYPE_REFERENCE; - import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.shadow.api.Shadow.directlyOn; -import android.annotation.DimenRes; -import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; -import android.content.res.Resources.Theme; -import android.content.res.TypedArray; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; import android.util.SparseArray; -import android.util.TypedValue; import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; - -import com.android.settings.R; -import org.robolectric.android.XmlResourceParserImpl; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; import org.robolectric.shadows.ShadowResources; -import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers.ClassParameter; -import org.w3c.dom.Node; /** * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot @@ -46,9 +28,7 @@ public class SettingsShadowResources extends ShadowResources { private static SparseArray sResourceOverrides = new SparseArray<>(); public static void overrideResource(int id, Object value) { - synchronized (sResourceOverrides) { - sResourceOverrides.put(id, value); - } + sResourceOverrides.put(id, value); } public static void overrideResource(String name, Object value) { @@ -61,75 +41,12 @@ public class SettingsShadowResources extends ShadowResources { } public static void reset() { - synchronized (sResourceOverrides) { - sResourceOverrides.clear(); - } - } - - @Implementation - public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException { - // Handle requests for private dimension resources, - // TODO: Consider making a set of private dimension resource ids if this happens repeatedly. - if (id == com.android.internal.R.dimen.preference_fragment_padding_bottom) { - return 0; - } - return directlyOn(realResources, Resources.class).getDimensionPixelSize(id); - } - - @Implementation - public int getColor(@ColorRes int id, @Nullable Theme theme) throws NotFoundException { - if (id == R.color.battery_icon_color_error) { - return Color.WHITE; - } - return directlyOn(realResources, Resources.class).getColor(id, theme); + sResourceOverrides.clear(); } @Implementation - public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme) - throws NotFoundException { - if (id == com.android.internal.R.color.text_color_primary) { - return ColorStateList.valueOf(Color.WHITE); - } - return directlyOn(realResources, Resources.class).getColorStateList(id, theme); - } - - /** - * Deprecated because SDK 24+ uses - * {@link SettingsShadowResourcesImpl#loadDrawable(Resources, TypedValue, int, int, Theme)} - * - * TODO: Delete when all tests have been migrated to sdk 26 - */ - @Deprecated - @Implementation - public Drawable loadDrawable(TypedValue value, int id, Theme theme) - throws NotFoundException { - // The drawable item in switchbar_background.xml refers to a very recent color attribute - // that Robolectric isn't yet aware of. - // TODO: Remove this once Robolectric is updated. - if (id == R.drawable.switchbar_background) { - return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { - // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, - // change it to a normal drawable. - id = R.drawable.ic_settings_wireless; - } else if (id == R.drawable.app_filter_spinner_background) { - id = R.drawable.ic_expand_more_inverse; - } - return super.loadDrawable(value, id, theme); - } - - @Implementation - public int[] getIntArray(@ArrayRes int id) throws NotFoundException { - // The Robolectric isn't aware of resources in settingslib, so we need to stub it here - if (id == com.android.settings.R.array.batterymeter_bolt_points - || id == com.android.settings.R.array.batterymeter_plus_points) { - return new int[2]; - } - - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected int[] getIntArray(@ArrayRes int id) throws NotFoundException { + final Object override = sResourceOverrides.get(id); if (override instanceof int[]) { return (int[]) override; } @@ -137,11 +54,8 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public String getString(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected String getString(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof String) { return (String) override; } @@ -150,11 +64,8 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public int getInteger(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected int getInteger(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof Integer) { return (Integer) override; } @@ -163,66 +74,12 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - public boolean getBoolean(int id) { - final Object override; - synchronized (sResourceOverrides) { - override = sResourceOverrides.get(id); - } + protected boolean getBoolean(int id) { + final Object override = sResourceOverrides.get(id); if (override instanceof Boolean) { return (boolean) override; } return directlyOn(realResources, Resources.class, "getBoolean", ClassParameter.from(int.class, id)); } - - @Implements(value = Theme.class) - public static class SettingsShadowTheme extends ShadowLegacyTheme { - - @RealObject - Theme realTheme; - - @Implementation - protected TypedArray obtainStyledAttributes( - AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) { - // Replace all private string references with a placeholder. - if (set != null) { - synchronized (set) { - for (int i = 0; i < set.getAttributeCount(); ++i) { - final String attributeValue = set.getAttributeValue(i); - final Node node = ReflectionHelpers.callInstanceMethod( - XmlResourceParserImpl.class, set, "getAttributeAt", - ReflectionHelpers.ClassParameter.from(int.class, i)); - if (attributeValue.contains("attr/fingerprint_layout_theme")) { - // Workaround for https://github.com/robolectric/robolectric/issues/2641 - node.setNodeValue("@style/FingerprintLayoutTheme"); - } - } - } - } - return super.obtainStyledAttributes(set, attrs, defStyleAttr, defStyleRes); - } - - @Implementation - public synchronized boolean resolveAttribute(int resid, TypedValue outValue, - boolean resolveRefs) { - // The real Resources instance in Robolectric tests somehow fails to find the - // preferenceTheme attribute in the layout. Let's do it ourselves. - if (getResources().getResourceName(resid) - .equals("com.android.settings:attr/preferenceTheme")) { - final int preferenceThemeResId = - getResources().getIdentifier( - "PreferenceTheme", "style", "com.android.settings"); - outValue.type = TYPE_REFERENCE; - outValue.data = preferenceThemeResId; - outValue.resourceId = preferenceThemeResId; - return true; - } - return directlyOn(realTheme, Theme.class) - .resolveAttribute(resid, outValue, resolveRefs); - } - - private Resources getResources() { - return ReflectionHelpers.callInstanceMethod(ShadowLegacyTheme.class, this, "getResources"); - } - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java deleted file mode 100644 index c76991e218c77e478141c3a3e774e83229ab374f..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java +++ /dev/null @@ -1,63 +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.content.res.Resources; -import android.content.res.ResourcesImpl; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.util.TypedValue; - -import com.android.settings.R; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowLegacyResourcesImpl; - -@Implements( - value = ResourcesImpl.class, - isInAndroidSdk = false, - minSdk = 26 -) -public class SettingsShadowResourcesImpl extends ShadowLegacyResourcesImpl { - - @Implementation - public Drawable loadDrawable(Resources wrapper, TypedValue value, int id, int density, - Resources.Theme theme) { - // The drawable item in switchbar_background.xml refers to a very recent color attribute - // that Robolectric isn't yet aware of. - // TODO: Remove this once Robolectric is updated. - if (id == R.drawable.switchbar_background - || id == R.color.ripple_material_light - || id == R.color.ripple_material_dark) { - return new ColorDrawable(); - } else if (id == R.drawable.ic_launcher_settings) { - // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, - // change it to a normal drawable. - id = R.drawable.ic_settings_wireless; - } else if (id == R.drawable.app_filter_spinner_background) { - id = R.drawable.ic_expand_more_inverse; - } else if (id == R.drawable.color_bar_progress - || id == R.drawable.ring_progress) { - // color_bar_progress and ring_progress use hidden resources, so just use the regular - // progress_horizontal drawable - id = android.R.drawable.progress_horizontal; - } - - return super.loadDrawable(wrapper, value, id, density, theme); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java deleted file mode 100644 index 1e64dd117bce97084d1aa57ee4d630b18f347007..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java +++ /dev/null @@ -1,47 +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 static org.robolectric.shadow.api.Shadow.directlyOn; - -import android.content.res.ColorStateList; -import android.content.res.TypedArray; -import android.graphics.Color; - -import androidx.annotation.Nullable; -import androidx.annotation.StyleableRes; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadows.ShadowTypedArray; - -@Implements(value = TypedArray.class) -public class SettingsShadowTypedArray extends ShadowTypedArray { - - @RealObject - TypedArray realTypedArray; - - @Implementation - @Nullable - public ColorStateList getColorStateList(@StyleableRes int index) { - if (index == com.android.internal.R.styleable.TextView_textColorLink) { - return ColorStateList.valueOf(Color.WHITE); - } - return directlyOn(realTypedArray, TypedArray.class).getColorStateList(index); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java index 2cb6964b779e34484492bce7cd2877b3bcc908e5..7d206f45047d93cc02e3640d4edfdb7108f1ce51 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessPoint.java @@ -25,7 +25,7 @@ import org.robolectric.annotation.Implements; public class ShadowAccessPoint { @Implementation - public String getSavedNetworkSummary() { + protected String getSavedNetworkSummary() { return "saved"; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java deleted file mode 100644 index 124f635ea80bc5dc83c9af1fcd79c52dfef6c108..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java +++ /dev/null @@ -1,49 +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.accessibilityservice.AccessibilityServiceInfo; -import android.content.ComponentName; -import android.view.accessibility.AccessibilityManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.ArrayList; -import java.util.List; - -@Implements(AccessibilityManager.class) -public class ShadowAccessibilityManager { - private static final List mInstalledAccessibilityList = - new ArrayList<>(); - - public static void addAccessibilityService(String serviceName) { - AccessibilityServiceInfo serviceInfo = new AccessibilityServiceInfo(); - serviceInfo.setComponentName(ComponentName.unflattenFromString(serviceName)); - mInstalledAccessibilityList.add(serviceInfo); - } - - @Implementation - public List getInstalledAccessibilityServiceList() { - return mInstalledAccessibilityList; - } - - @Implementation - public static boolean isAccessibilityButtonSupported() { - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java index 551f263990c18d78b4580396cfd038acc5f56dc1..5a65be0067ac2ed244810d84e572485f5c3f0bf8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfo.java @@ -31,7 +31,7 @@ public class ShadowAccessibilityServiceInfo { } @Implementation - public ComponentName getComponentName() { + protected ComponentName getComponentName() { return sComponentName; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java index bf54d2fa7c000da6b890c8f340344632ab8252ff..409c2612eca5d4f85c02c5532e653d7c01c19a37 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java @@ -36,7 +36,7 @@ public class ShadowAccountManager { private static final Map> sAccountsByUserId = new HashMap<>(); @Implementation - public AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) { + protected AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) { return sAuthenticators.values().toArray(new AuthenticatorDescription[sAuthenticators.size()]); } @@ -50,7 +50,7 @@ public class ShadowAccountManager { } @Implementation @NonNull - public Account[] getAccountsAsUser(int userId) { + protected Account[] getAccountsAsUser(int userId) { if (sAccountsByUserId.containsKey(userId)) { return sAccountsByUserId.get(userId).toArray(new Account[0]); } else { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java index b7698b302ceea8ef43781692dba0e00eac3339a6..38d658c3544f5826caf9e0bfb02ffcf25122b478 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityManager.java @@ -26,7 +26,7 @@ public class ShadowActivityManager { private static int sCurrentUserId = 0; @Implementation - public static int getCurrentUser() { + protected static int getCurrentUser() { return sCurrentUserId; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java deleted file mode 100644 index a6d6babcb369b99f6fb5b10a78fcdfc0fc444bfb..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java +++ /dev/null @@ -1,44 +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.testutils.shadow; - -import android.app.Activity; - -import androidx.loader.app.LoaderManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowActivity; - -/* - * Shadow for {@link Activity} that has LoadManager accessors. - */ -@Implements(Activity.class) -public class ShadowActivityWithLoadManager extends ShadowActivity { - - private LoaderManager mLoaderManager; - - @Implementation - public LoaderManager getLoaderManager() { - return mLoaderManager; - } - - // Non-Android setter. - public void setLoaderManager(LoaderManager loaderManager) { - mLoaderManager = loaderManager; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java index c41aa8ee2232eb11eca3fad02c3704fca7811a86..f8cdb2269a93849e8dbc479405e16a25c9784af9 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java @@ -25,12 +25,12 @@ import org.robolectric.annotation.Implements; public class ShadowAppInfoBase { @Implementation - public void onResume() { + protected void onResume() { // No-op. } @Implementation - public void onPause() { + protected void onPause() { // No-op. } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java index 3ee4fcb16476b1f22b62dc234a76e98e9e8860e0..8239ed9ab839d2a78d5bfb9fabbc5c9508b54e25 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java @@ -26,7 +26,7 @@ import org.robolectric.annotation.Implements; @Implements(ApplicationsState.class) public class ShadowApplicationsState { @Implementation - public Looper getBackgroundLooper() { + protected Looper getBackgroundLooper() { return Looper.getMainLooper(); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java index cee04ca351efef72497b605f55679be4ae2af3ce..4a519aaa0f6422b99a5c6f0540f34140e63ec145 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java @@ -28,12 +28,12 @@ import org.robolectric.annotation.Implements; public class ShadowAudioHelper { @Implementation - public boolean isSingleVolume() { + protected boolean isSingleVolume() { return true; } @Implementation - public int getManagedProfileId(UserManager um) { + protected int getManagedProfileId(UserManager um) { return UserHandle.USER_CURRENT; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index 6636a6cf431c172dcf3da707c27addf2f5d577c8..e651bafa47c25e93e0805268631538563878c680 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -31,9 +31,9 @@ import android.media.AudioDeviceCallback; import android.media.AudioManager; import android.os.Handler; +import java.util.List; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; @@ -43,8 +43,7 @@ public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManag private int mRingerMode; private int mDeviceCodes; private boolean mMusicActiveRemotely; - private boolean mBluetoothScoOn; - private ArrayList mDeviceCallbacks = new ArrayList(); + private List mDeviceCallbacks = new ArrayList<>(); @Implementation private int getRingerModeInternal() { @@ -100,11 +99,4 @@ public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManag return 0; } } - - public void setBluetoothScoOn(boolean bluetoothScoOn) { - mBluetoothScoOn = bluetoothScoOn; - } - - @Implementation - public boolean isBluetoothScoOn() { return mBluetoothScoOn; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java deleted file mode 100644 index 4ca894314a4f67542f21f71007f77831552aac1e..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java +++ /dev/null @@ -1,31 +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 androidx.core.text.BidiFormatter; -import androidx.core.text.TextDirectionHeuristicCompat; - -import org.robolectric.annotation.Implements; - -@Implements(BidiFormatter.class) -public class ShadowBidiFormatter { - - public CharSequence unicodeWrap(CharSequence str, TextDirectionHeuristicCompat heuristic, - boolean isolate) { - return str; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java index 371c1b10798a941eadbb889e49cb2d7500dba4e4..2444df66bf034b0e3301bef06d030e7786d8bdb4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java @@ -28,10 +28,10 @@ import java.util.List; public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBluetoothAdapter { private int mState; - private List mSupportedProfiles = new ArrayList(); + private List mSupportedProfiles = new ArrayList<>(); @Implementation - public List getSupportedProfiles() { + protected List getSupportedProfiles() { return mSupportedProfiles; } @@ -44,7 +44,7 @@ public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBlueto } @Implementation - public int getConnectionState() { + protected int getConnectionState() { return mState; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java index 0b1665ca82d75566fdf5200758ae0a357f66071e..0e903bbe15cebe9c5167962dc42d073c019fb277 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java @@ -29,32 +29,32 @@ public class ShadowBluetoothDevice extends org.robolectric.shadows.ShadowBluetoo private int mSimAccessPermission = BluetoothDevice.ACCESS_UNKNOWN; @Implementation - public void setMessageAccessPermission(int value) { + protected void setMessageAccessPermission(int value) { mMessageAccessPermission = value; } @Implementation - public int getMessageAccessPermission() { + protected int getMessageAccessPermission() { return mMessageAccessPermission; } @Implementation - public void setPhonebookAccessPermission(int value) { + protected void setPhonebookAccessPermission(int value) { mPhonebookAccessPermission = value; } @Implementation - public int getPhonebookAccessPermission() { + protected int getPhonebookAccessPermission() { return mPhonebookAccessPermission; } @Implementation - public void setSimAccessPermission(int value) { + protected void setSimAccessPermission(int value) { mSimAccessPermission = value; } @Implementation - public int getSimAccessPermission() { + protected int getSimAccessPermission() { return mSimAccessPermission; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.java deleted file mode 100644 index 2724d98d70364850ce2dfa760866ee184e766861..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothPan.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.bluetooth.BluetoothPan; -import android.bluetooth.BluetoothProfile; -import android.content.Context; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(BluetoothPan.class) -public class ShadowBluetoothPan { - @Implementation - public void __constructor__(Context context, BluetoothProfile.ServiceListener l) { - // Do nothing, implement it to avoid null pointer error inside BluetoothPan - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java index fcf79e2ff72655374acb1defe5a4bfbb8f228135..c00944280266593ec8a0c64061ec4ae9986423fb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothUtils.java @@ -27,12 +27,11 @@ import org.robolectric.annotation.Resetter; @Implements(Utils.class) public class ShadowBluetoothUtils { - public static LocalBluetoothManager sLocalBluetoothManager; - + public static LocalBluetoothManager sLocalBluetoothManager; @Implementation - public static LocalBluetoothManager getLocalBtManager(Context context) { + protected static LocalBluetoothManager getLocalBtManager(Context context) { return sLocalBluetoothManager; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java index ee04c4f1d389e7c8dd0b9e0053be95a83d60c1c4..2d77240d436b72f067e7c7d3cdae34138ab803e8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java @@ -38,7 +38,7 @@ public class ShadowCachedBluetoothDeviceManager { } @Implementation - public synchronized Collection getCachedDevicesCopy() { + protected synchronized Collection getCachedDevicesCopy() { return mCachedDevices; } } \ No newline at end of file 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 794fcbbf2b8235da3e747b84f907f5a3d8a37338..4e217267ef6357f6cd1b3e63418c2a1f95cca375 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java @@ -35,7 +35,7 @@ public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowCon } @Implementation - public boolean isNetworkSupported(int networkType) { + protected boolean isNetworkSupported(int networkType) { return mSupportedNetworkTypes.get(networkType); } @@ -44,7 +44,7 @@ public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowCon } @Implementation - public boolean isTetheringSupported() { + protected boolean isTetheringSupported() { return mTetheringSupported; } 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 7bfb1c55b8e827eb0b05f8419d6a66ca0f1c5749..4d4cfc7701d0d35d3500072199a3b26a7c0d3d4c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -42,12 +42,12 @@ public class ShadowContentResolver { private static Map sMasterSyncAutomatically = new HashMap<>(); @Implementation - public static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) { + protected static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) { return sSyncAdapterTypes; } @Implementation - public final Cursor query(Uri uri, String[] projection, String selection, + protected final Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS); MatrixCursor.RowBuilder builder = cursor.newRow() @@ -56,26 +56,26 @@ public class ShadowContentResolver { } @Implementation - public static int getIsSyncableAsUser(Account account, String authority, int userId) { + protected static int getIsSyncableAsUser(Account account, String authority, int userId) { return sSyncable.containsKey(authority) ? sSyncable.get(authority) : 1; } @Implementation - public static boolean getSyncAutomaticallyAsUser(Account account, String authority, + protected static boolean getSyncAutomaticallyAsUser(Account account, String authority, int userId) { return sSyncAutomatically.containsKey(authority) ? sSyncAutomatically.get(authority) : true; } @Implementation - public static void setSyncAutomaticallyAsUser(Account account, String authority, boolean sync, - int userId) { + protected static void setSyncAutomaticallyAsUser(Account account, String authority, + boolean sync, int userId) { if (TextUtils.isEmpty(authority)) { throw new IllegalArgumentException("Authority must be non-empty"); } } @Implementation - public static boolean getMasterSyncAutomaticallyAsUser(int userId) { + protected static boolean getMasterSyncAutomaticallyAsUser(int userId) { return sMasterSyncAutomatically.containsKey(userId) ? sMasterSyncAutomatically.get(userId) : true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java deleted file mode 100644 index c1f82933b9322cbb2ec4fc76e5a8e7a1e1af72ee..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContextImplWithRegisterReceiver.java +++ /dev/null @@ -1,40 +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.testutils.shadow; - -import android.content.BroadcastReceiver; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Handler; -import android.os.UserHandle; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowContextImpl; - -/* - * Shadow for {@link ContextImpl} that has registerReceiverAsUser method. - */ -@Implements(className = ShadowContextImpl.CLASS_NAME) -public class ShadowContextImplWithRegisterReceiver extends ShadowContextImpl { - - @Implementation - public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, - IntentFilter filter, String broadcastPermission, Handler scheduler) { - return super.registerReceiver(receiver, filter, broadcastPermission, scheduler); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java index 88b0b5fc0f799e29d5f0e7f876f6aeee69312010..4d1a2ed30440527e5bf8f5a0a6d188ff39b92c43 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java @@ -11,12 +11,12 @@ public class ShadowDataSaverBackend { private static boolean isEnabled = true; @Implementation - public boolean isDataSaverEnabled() { + protected boolean isDataSaverEnabled() { return isEnabled; } @Implementation - public void setDataSaverEnabled(boolean enabled) { + protected void setDataSaverEnabled(boolean enabled) { isEnabled = enabled; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java index 9b8821a6b5789f8d153716e6b693029a255ccf40..9973a2d19fefdf25618007d0dbb0a94c49891c8e 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java @@ -17,25 +17,25 @@ public class ShadowDataUsageUtils { public static int DEFAULT_SUBSCRIPTION_ID = SubscriptionManager.INVALID_SUBSCRIPTION_ID; @Implementation - public static boolean hasMobileData(Context context) { + protected static boolean hasMobileData(Context context) { return IS_MOBILE_DATA_SUPPORTED; } @Implementation - public static boolean hasWifiRadio(Context context) { + protected static boolean hasWifiRadio(Context context) { return IS_WIFI_SUPPORTED; } @Implementation - public static int getDefaultSubscriptionId(Context context) { + protected static int getDefaultSubscriptionId(Context context) { return DEFAULT_SUBSCRIPTION_ID; } @Implementation - public static boolean hasSim(Context context) { + protected static boolean hasSim(Context context) { return HAS_SIM; } @Implementation - public static boolean hasEthernet(Context context) { return false; } + protected static boolean hasEthernet(Context context) { return false; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java deleted file mode 100644 index 8aa5dab9107a13621ff032fc7cfeb29929d48131..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ /dev/null @@ -1,37 +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.content.Context; -import android.content.pm.ResolveInfo; - -import com.android.settings.search.DatabaseIndexingUtils; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * Shadow of {@link DatabaseIndexingUtils} - */ -@Implements(DatabaseIndexingUtils.class) -public class ShadowDatabaseIndexingUtils { - @Implementation - public static boolean isWellKnownProvider(ResolveInfo info, Context context) { - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java index b4e64924628d17d43a9a715bb856d5c1a290c86b..6d2dbef467cc752ac15d5851d828d4840855d0f8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java @@ -5,7 +5,6 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; -import android.os.PersistableBundle; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; @@ -13,7 +12,6 @@ import org.robolectric.annotation.Implements; import org.robolectric.shadow.api.Shadow; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Objects; @@ -23,7 +21,7 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev private final Map mProfileTimeouts = new HashMap<>(); private Map mSupportMessagesMap = new HashMap<>(); private boolean mIsAdminActiveAsUser = false; - ComponentName mDeviceOwnerComponentName; + private ComponentName mDeviceOwnerComponentName; private int mDeviceOwnerUserId = -1; public void setShortSupportMessageForUser(ComponentName admin, int userHandle, String message) { @@ -31,29 +29,28 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev } @Implementation - public @Nullable - CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin, + protected @Nullable CharSequence getShortSupportMessageForUser(@NonNull ComponentName admin, int userHandle) { return mSupportMessagesMap.get(Objects.hash(admin, userHandle)); } @Implementation - public boolean isAdminActiveAsUser(@NonNull ComponentName admin, int userId) { + protected boolean isAdminActiveAsUser(@NonNull ComponentName admin, int userId) { return mIsAdminActiveAsUser; } @Implementation - public int getDeviceOwnerUserId() { + protected int getDeviceOwnerUserId() { return mDeviceOwnerUserId; } @Implementation - public long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) { + protected long getMaximumTimeToLock(ComponentName admin, @UserIdInt int userHandle) { return mProfileTimeouts.getOrDefault(userHandle, 0L); } @Implementation - public ComponentName getDeviceOwnerComponentOnAnyUser() { + protected ComponentName getDeviceOwnerComponentOnAnyUser() { return mDeviceOwnerComponentName; } @@ -77,10 +74,4 @@ public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDev return (ShadowDevicePolicyManager) Shadow.extract( RuntimeEnvironment.application.getSystemService(DevicePolicyManager.class)); } - - public @Nullable - List getTrustAgentConfiguration( - @Nullable ComponentName admin, @NonNull ComponentName agent) { - return null; - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java index 2f37ec8370e7ee94a997470f25a182bdcbdcfa22..4cb9446bd84acdfc567d0c8b112d69458f9d9c87 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java @@ -12,13 +12,14 @@ import org.robolectric.annotation.Implements; @Implements(DoubleTwistPreferenceController.class) public class ShadowDoubleTwistPreferenceController { private static int sManagedProfileId = UserHandle.USER_NULL; + @Implementation - public static boolean isGestureAvailable(Context context) { + protected static boolean isGestureAvailable(Context context) { return true; } @Implementation - public static int getManagedProfileId(UserManager userManager) { + protected static int getManagedProfileId(UserManager userManager) { return sManagedProfileId; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java deleted file mode 100644 index d3741bb10abcef98eba9f5f7c4ead6fb29fc6e6f..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java +++ /dev/null @@ -1,42 +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.text.DynamicLayout; -import android.text.Layout.Directions; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(DynamicLayout.class) -public class ShadowDynamicLayout { - - @Implementation - public int getLineTop(int line) { - return 0; - } - - @Implementation - public int getLineStart(int line) { - return 0; - } - - @Implementation - public final Directions getLineDirections(int line) { - return new Directions(new int[]{0, 1}); - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java index 56f4979434481bb98a369f8fc935274811cf3b6b..4e22a32c08f3660823c3a6706783d84711c7918d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java @@ -42,9 +42,8 @@ public class ShadowEntityHeaderController { } @Implementation - public static EntityHeaderController newInstance(Activity activity, Fragment fragment, + protected static EntityHeaderController newInstance(Activity activity, Fragment fragment, View header) { return sMockController; } - -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java deleted file mode 100644 index 9caf09f3e8db809736eb184932ce498ae100b9bd..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEventLogWriter.java +++ /dev/null @@ -1,33 +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.content.Context; - -import com.android.settingslib.core.instrumentation.EventLogWriter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(value = EventLogWriter.class, callThroughByDefault = false) -public class ShadowEventLogWriter { - @Implementation - public void visible(Context context, int source, int category) { - - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index cb185a501bb088a943f8c5267e4713bd360e7090..90c59105b401f9ee8306d02c67ebdeb85d1b4b99 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,64 +19,16 @@ package com.android.settings.testutils.shadow; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; -import androidx.annotation.NonNull; - -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.shadow.api.Shadow; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.stream.IntStream; @Implements(FingerprintManager.class) public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager { - - public boolean hardwareDetected = true; - - @NonNull - private List mFingerprints = Collections.emptyList(); - - @Implementation - protected boolean isHardwareDetected() { - return hardwareDetected; - } - - @Implementation - protected boolean hasEnrolledFingerprints() { - return !mFingerprints.isEmpty(); - } - - @Implementation - protected List getEnrolledFingerprints() { - return mFingerprints; - } - @Implementation protected List getEnrolledFingerprints(int userId) { - return mFingerprints; - } - - public void setEnrolledFingerprints(Fingerprint... fingerprints) { - mFingerprints = Arrays.asList(fingerprints); - } - - public void setDefaultFingerprints(int num) { - setEnrolledFingerprints( - IntStream.range(0, num) - .mapToObj(i -> new Fingerprint( - "Fingerprint " + i, - 0, /* groupId */ - i, /* fingerId */ - 0 /* deviceId */)) - .toArray(Fingerprint[]::new)); - } - - public static ShadowFingerprintManager get() { - return (ShadowFingerprintManager) Shadow.extract( - RuntimeEnvironment.application.getSystemService(FingerprintManager.class)); + return getEnrolledFingerprints(); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java index 050b292cdb63ec6cd675b544c21c772468fec262..a70d4d6baf712a621910b4485369f542ba862025 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java @@ -17,31 +17,22 @@ package com.android.settings.testutils.shadow; import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -/** - * Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception - * in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as - * the current {@link Fragment}. This is infeasible with our current framework. - */ -@Implements( - value = Fragment.class, - minSdk = 26 -) +@Implements(value = Fragment.class) public class ShadowFragment { private Fragment mTargetFragment; @Implementation - public void setTargetFragment(Fragment fragment, int requestCode) { + protected void setTargetFragment(Fragment fragment, int requestCode) { mTargetFragment = fragment; } @Implementation - final public Fragment getTargetFragment() { + protected Fragment getTargetFragment() { return mTargetFragment; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java index 9873502204508604fd7c8c18aac3ba35c23a263b..7d5fd87b829abe72a07eec59c3b5c4d597a253d5 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java @@ -42,7 +42,7 @@ public class ShadowHelpUtils { } @Implementation - public static Intent getHelpIntent(Context context, String helpUriString, + protected static Intent getHelpIntent(Context context, String helpUriString, String backupContext) { mGetHelpIntentCalled = true; return new Intent().setClassName( diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java index 4dec502d4832e939f2cdd2fc7d7df2ff44a3573e..c21f7cc1d2219f2056003be8f8f8193ebaad4f71 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java @@ -36,12 +36,12 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice private int mDeviceId; @Implementation - public static int[] getDeviceIds() { + protected static int[] getDeviceIds() { return sDeviceIds; } @Implementation - public static InputDevice getDevice(int id) { + protected static InputDevice getDevice(int id) { return sDeviceMap.get(id); } @@ -56,7 +56,7 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice } @Implementation - public int getId() { + protected int getId() { return mDeviceId; } @@ -70,6 +70,4 @@ public class ShadowInputDevice extends org.robolectric.shadows.ShadowInputDevice public void setId(int id) { mDeviceId = id; } - } - diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java index 5b09645ac9986f85decf1dbf5651dcf2e8de23a5..c0f71342b8c89d030a02f31ae396883dcdff3543 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputManager.java @@ -27,31 +27,31 @@ import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -/* - * Shadow for {@ InputManager} that has assessors for registered {@link InputDeviceListener}s. +/** + * Shadow for {@link InputManager} that has accessors for registered + * {@link InputManager.InputDeviceListener}s. */ @Implements(value = InputManager.class, callThroughByDefault = false) public class ShadowInputManager { - private ArrayList mInputDeviceListeners; + private List mInputDeviceListeners; @Implementation - public void __constructor__(IInputManager service) { + protected void __constructor__(IInputManager service) { mInputDeviceListeners = new ArrayList<>(); } @Implementation - public static InputManager getInstance() { + protected static InputManager getInstance() { return ReflectionHelpers.callConstructor( InputManager.class, from(IInputManager.class, null)); } @Implementation - public void registerInputDeviceListener(InputManager.InputDeviceListener listener, + protected void registerInputDeviceListener(InputManager.InputDeviceListener listener, Handler handler) { // TODO: Use handler. if (!mInputDeviceListeners.contains(listener)) { @@ -60,14 +60,7 @@ public class ShadowInputManager { } @Implementation - public void unregisterInputDeviceListener(InputManager.InputDeviceListener listener) { - if (mInputDeviceListeners.contains(listener)) { - mInputDeviceListeners.remove(listener); - } - } - - // Non-Android accessor. - public List getRegisteredInputDeviceListeners() { - return Collections.unmodifiableList(mInputDeviceListeners); + protected void unregisterInputDeviceListener(InputManager.InputDeviceListener listener) { + mInputDeviceListeners.remove(listener); } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java index 0b7d69ba3a68efc2984a2ad95c41fcf9d8add22d..98022477a6f766f5fa3540aaaca8322fca7549c9 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputMethodManagerWithMethodList.java @@ -42,7 +42,7 @@ public class ShadowInputMethodManagerWithMethodList extends ShadowInputMethodMan } @Implementation - public List getInputMethodList() { + protected List getInputMethodList() { return mInputMethodInfos; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java index c025a33a2f52da763d92de9e282a0742e21edc61..098dcfc357e5c35966e89d0181a420c426cc77bb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyStore.java @@ -33,7 +33,7 @@ public class ShadowKeyStore { } @Implementation - public boolean isHardwareBacked() { + protected boolean isHardwareBacked() { return sIsHardwareBacked; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java deleted file mode 100644 index ddac6c71a68699c22927dd961bf23417163c34e6..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothAdapter.java +++ /dev/null @@ -1,55 +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 com.android.settingslib.bluetooth.LocalBluetoothAdapter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(LocalBluetoothAdapter.class) -public class ShadowLocalBluetoothAdapter { - - private static String sName; - private boolean isBluetoothEnabled = true; - - public static void setName(String name) { - sName = name; - } - - @Implementation - public String getName() { - return sName; - } - - @Implementation - public boolean isEnabled() { - return isBluetoothEnabled; - } - - @Implementation - public boolean enable() { - isBluetoothEnabled = true; - return true; - } - - @Implementation - public boolean disable() { - isBluetoothEnabled = false; - return true; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java deleted file mode 100644 index 9e64e34f3b266f4e50239b17328ed6de79489a89..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLocalBluetoothProfileManager.java +++ /dev/null @@ -1,38 +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.content.Context; - -import com.android.settingslib.bluetooth.BluetoothEventManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; -import com.android.settingslib.bluetooth.LocalBluetoothAdapter; -import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; - -import org.robolectric.annotation.Implements; - -@Implements(LocalBluetoothProfileManager.class) -public class ShadowLocalBluetoothProfileManager { - - public void __constructor__(Context context, - LocalBluetoothAdapter adapter, - CachedBluetoothDeviceManager deviceManager, - BluetoothEventManager eventManager) { - - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java index 86276689b57fbc7c545e214a217089c63c1795eb..663ab91e580a532b79ddf36910f8801b7c6cbfa8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -29,45 +29,34 @@ import java.util.List; @Implements(LockPatternUtils.class) public class ShadowLockPatternUtils { - private int mPasswordQuality = 1; private static boolean sDeviceEncryptionEnabled; @Implementation - public boolean isSecure(int id) { + protected boolean isSecure(int id) { return true; } @Implementation - public int getActivePasswordQuality(int userId) { + protected int getActivePasswordQuality(int userId) { return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; } @Implementation - public int getKeyguardStoredPasswordQuality(int userHandle) { - return mPasswordQuality; + protected int getKeyguardStoredPasswordQuality(int userHandle) { + return 1; } @Implementation - public static boolean isDeviceEncryptionEnabled() { + protected static boolean isDeviceEncryptionEnabled() { return sDeviceEncryptionEnabled; } @Implementation - public List getEnabledTrustAgents(int userId) { + protected List getEnabledTrustAgents(int userId) { return null; } public static void setDeviceEncryptionEnabled(boolean deviceEncryptionEnabled) { sDeviceEncryptionEnabled = deviceEncryptionEnabled; } - - // Non-Android accessor. - public int getPasswordQuality() { - return mPasswordQuality; - } - - // Non-Android accessor. - public void setPasswordQuality(int passwordQuality) { - mPasswordQuality = passwordQuality; - } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java deleted file mode 100644 index a69fabaa93a69190ebea1d9ab61a323398bdc55e..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java +++ /dev/null @@ -1,52 +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 static org.robolectric.RuntimeEnvironment.application; - -import android.media.MediaRouter; - -import org.robolectric.annotation.Implements; -import org.robolectric.shadow.api.Shadow; - -import java.util.concurrent.CopyOnWriteArrayList; - -@Implements(value = MediaRouter.class) -public class ShadowMediaRouter extends org.robolectric.shadows.ShadowMediaRouter { - MediaRouter.RouteInfo mSelectedRoute; - - final CopyOnWriteArrayList mCallbacks = - new CopyOnWriteArrayList<>(); - - public MediaRouter.RouteInfo getSelectedRoute(int type) { - return mSelectedRoute; - } - - public void addCallback(int types, MediaRouter.Callback cb) { - mCallbacks.add(cb); - } - - public void removeCallback(MediaRouter.Callback cb) { - if (mCallbacks.contains(cb)) { - mCallbacks.remove(cb); - } - } - - public static ShadowMediaRouter getShadow() { - return Shadow.extract(application.getSystemService(MediaRouter.class)); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java index 07c8e544d6a649246fd4e1a41537317c30bb791f..fb8c068f3ba1e5356724e10222c23a877b378f3c 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java @@ -36,30 +36,30 @@ public class ShadowNfcAdapter { private boolean mIsNfcEnabled = false; @Implementation - public void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, int flags, - Bundle extras) { + protected void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback, + int flags, Bundle extras) { sReaderModeEnabled = true; } @Implementation - public static NfcAdapter getDefaultAdapter(Context context) { + protected static NfcAdapter getDefaultAdapter(Context context) { return ReflectionHelpers.callConstructor( NfcAdapter.class, ClassParameter.from(Context.class, context)); } @Implementation - public boolean isEnabled() { + protected boolean isEnabled() { return mIsNfcEnabled; } @Implementation - public boolean enable() { + protected boolean enable() { mIsNfcEnabled = true; return true; } @Implementation - public boolean disable() { + protected boolean disable() { mIsNfcEnabled = false; return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java index 307870319b6ee08d1768476c948d0ab48cd1b0c6..a1b1a23b547b219af824ac915ba0b7d723c6db7b 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNotificationManager.java @@ -27,15 +27,13 @@ public class ShadowNotificationManager { private int mZenMode; - @Implementation - public void setZenMode(int mode, Uri conditionId, String reason) { + protected void setZenMode(int mode, Uri conditionId, String reason) { mZenMode = mode; } @Implementation - public int getZenMode() { + protected int getZenMode() { return mZenMode; } } - diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java index d1ac84c60a215aadb59c4f1f6543c50380fe1562..72dfcb80de7b00e611581d70204efb25fcaee04a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java @@ -40,7 +40,7 @@ public class ShadowOs { private static final byte[] IPV6_BYTES = new byte[16]; @Implementation - public static InetAddress inet_pton(int family, String address) { + protected static InetAddress inet_pton(int family, String address) { if ((AF_INET == family && IPV4_PATTERN.matcher(address).find()) || (AF_INET6 == family && IPV6_PATTERN.matcher(address).find())) { try { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java deleted file mode 100644 index 5a5f076ca046519f3b9b7774511f71033fc8e99f..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPackageMonitor.java +++ /dev/null @@ -1,63 +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.testutils.shadow; - -import static org.robolectric.util.ReflectionHelpers.ClassParameter.from; - -import android.content.Context; -import android.os.Looper; -import android.os.UserHandle; - -import com.android.internal.content.PackageMonitor; -import com.android.internal.os.BackgroundThread; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowApplication; -import org.robolectric.shadows.ShadowMessageQueue; - -/* - * Shadow for hidden {@link PackageMonitor}. - */ -@Implements(value = PackageMonitor.class, isInAndroidSdk = false) -public class ShadowPackageMonitor { - - @RealObject - private PackageMonitor mPackageMonitor; - - @Implementation - public void register(Context context, Looper thread, UserHandle user, boolean externalStorage) { - // Call through to @RealObject's method. - Shadow.directlyOn(mPackageMonitor, PackageMonitor.class, "register", - from(Context.class, context), from(Looper.class, thread), - from(UserHandle.class, user), from(Boolean.TYPE, externalStorage)); - // When thread is null, the {@link BackgroundThread} is used. Here we have to - // setup background Robolectric scheduler for it. - if (thread == null) { - setupBackgroundThreadScheduler(); - } - } - - private static void setupBackgroundThreadScheduler() { - ShadowMessageQueue shadowMessageQueue = Shadow.extract( - BackgroundThread.getHandler().getLooper().getQueue()); - shadowMessageQueue.setScheduler( - ShadowApplication.getInstance().getBackgroundThreadScheduler()); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java index 6e42fea56d5b54ebd626544ae049603aa10eba0f..665e415aa53c9b43de9428c0cb4a9dfdf5dae709 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowParcel.java @@ -16,17 +16,17 @@ public class ShadowParcel { public static boolean sReadBoolResult; @Implementation - public int readInt() { + protected int readInt() { return sReadIntResult; } @Implementation - public void writeInt(int val) { + protected void writeInt(int val) { sWriteIntResult = val; } @Implementation - public boolean readBoolean() { + protected boolean readBoolean() { return sReadBoolResult; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java deleted file mode 100644 index 35c6630ba4729a029c80f72bcfb85eb29c82c679..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ /dev/null @@ -1,91 +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.content.Context; -import android.content.pm.PackageManager; -import android.text.TextUtils; - -import androidx.annotation.NonNull; -import androidx.core.content.PermissionChecker; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - -/** - * This class provides shadow for API that is not supported in current roboletric - */ -@Implements(PermissionChecker.class) -public class ShadowPermissionChecker { - - private static Map sPermissions = new HashMap<>(); - - public static void clear() { - sPermissions.clear(); - } - - public static void addPermission(String permission, int pid, int uid, String packageName, - int permissionValue) { - sPermissions.put(new PermissionInfo(permission, pid, uid, packageName), permissionValue); - } - - @Implementation - public static int checkPermission(@NonNull Context context, @NonNull String permission, - int pid, int uid, String packageName) { - return sPermissions.getOrDefault(new PermissionInfo(permission, pid, uid, packageName), - PackageManager.PERMISSION_DENIED); - } - - private static class PermissionInfo { - private final int mPid; - private final int mUid; - private final String mPackageName; - private final String mPermission; - - public PermissionInfo(String permission, int pid, int uid, String packageName) { - mPid = pid; - mUid = uid; - mPackageName = packageName; - mPermission = permission; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof PermissionInfo)) { - return false; - } - - final PermissionInfo other = (PermissionInfo) obj; - return mPid == other.mPid - && mUid == other.mUid - && TextUtils.equals(mPackageName, other.mPackageName) - && TextUtils.equals(mPermission, other.mPermission); - } - - @Override - public int hashCode() { - return Objects.hash(mPid, mUid, mPackageName, mPermission); - } - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java index 9fcc599b1c9e485a5c404a0a14f25b2d0ef9b698..22c38bec7e438b364060906fe6d33dd29dd55d23 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java @@ -26,22 +26,22 @@ import org.robolectric.annotation.Implements; public class ShadowPowerManager { @Implementation - public int getMinimumScreenBrightnessSetting() { + protected int getMinimumScreenBrightnessSetting() { return 0; } @Implementation - public int getMaximumScreenBrightnessSetting() { + protected int getMaximumScreenBrightnessSetting() { return 0; } @Implementation - public int getMinimumScreenBrightnessForVrSetting() { + protected int getMinimumScreenBrightnessForVrSetting() { return 0; } @Implementation - public int getMaximumScreenBrightnessForVrSetting() { + protected int getMaximumScreenBrightnessForVrSetting() { return 0; } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java index 4500b23b2a430bbe75edcb023412aebe3eea24d0..c40e9c9b9363aef293a8b54477eeac80900bb307 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java @@ -22,7 +22,7 @@ import org.robolectric.annotation.Implements; @Implements(PowerWhitelistBackend.class) public class ShadowPowerWhitelistBackend { - public void __constructor__() { + protected void __constructor__() { // Do nothing } } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java deleted file mode 100644 index eea3ee896e74d602e03005864d8e87ae67e454bf..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowProcess.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.android.settings.testutils.shadow; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(android.os.Process.class) -public class ShadowProcess { - private static int sUid; - - public static void setMyUid(int uid) { - sUid = uid; - } - - @Implementation - public static int myUid() { - return sUid; - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java index 3a98a0b8d45086a00cc5b5ca4a9bb8257b04a296..836b1c8a0f8b842d61de04a0e22d26e087fec2e6 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRecoverySystem.java @@ -29,7 +29,7 @@ public class ShadowRecoverySystem { private static int sWipeEuiccCalledCount; @Implementation - public static boolean wipeEuiccData(Context context, final String packageName) { + protected static boolean wipeEuiccData(Context context, final String packageName) { sWipeEuiccCalledCount++; return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java index c054656547e1dc1fe545c008fdce35222a4979c7..ceb032cf4ba5ead053346b0119e6c06784eda690 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java @@ -29,7 +29,7 @@ public class ShadowRestrictedLockUtils { private static boolean sAdminSupportDetailsIntentLaunched; @Implementation - public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { + protected static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { sAdminSupportDetailsIntentLaunched = true; } @@ -40,6 +40,4 @@ public class ShadowRestrictedLockUtils { public static void clearAdminSupportDetailsIntentLaunch() { sAdminSupportDetailsIntentLaunched = false; } - - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java index 150843194ae7eea5b5999fd40873ef5d0e796237..e39056cedf323dae79b4e619683a1d087735a029 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java @@ -48,7 +48,7 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfMeteredDataRestricted(Context context, + protected static EnforcedAdmin checkIfMeteredDataRestricted(Context context, String packageName, int userId) { if (sIsRestricted) { return new EnforcedAdmin(); @@ -60,7 +60,7 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfAccountManagementDisabled(Context context, + protected static EnforcedAdmin checkIfAccountManagementDisabled(Context context, String accountType, int userId) { if (accountType == null) { return null; @@ -79,25 +79,25 @@ public class ShadowRestrictedLockUtilsInternal { } @Implementation - public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context, + protected static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context, int features, final @UserIdInt int userId) { return (sKeyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin(); } @Implementation - public static boolean hasBaseUserRestriction(Context context, + protected static boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) { return sIsRestricted; } @Implementation - public static EnforcedAdmin checkIfRestrictionEnforced(Context context, + protected static EnforcedAdmin checkIfRestrictionEnforced(Context context, String userRestriction, int userId) { return sIsRestricted ? new EnforcedAdmin() : null; } @Implementation - public static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) { + protected static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) { return sMaximumTimeToLockIsSet ? new EnforcedAdmin() : null; } @@ -132,5 +132,4 @@ public class ShadowRestrictedLockUtilsInternal { public static void setMaximumTimeToLockIsSet(boolean isSet) { sMaximumTimeToLockIsSet = isSet; } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java index 372116ca95d4cfc5f98692813602db6c56a4ad98..90292f1bd81b8269fc6b72c1a0a2ef00eda79d4d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java @@ -13,7 +13,7 @@ public class ShadowRestrictionUtils { private static boolean isRestricted = false; @Implementation - public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) { + protected EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) { if (isRestricted) { return new EnforcedAdmin(); } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java index 47566cc34a77978c0aca1c4192dca10ee7b82796..a99c80e665d43ffe62f68f68ee1cb1851022a696 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRotationPolicy.java @@ -25,20 +25,22 @@ import org.robolectric.annotation.Implements; @Implements(RotationPolicy.class) public class ShadowRotationPolicy { + private static boolean rotationLockEnabled = false; private static boolean rotationSupported = true; + @Implementation - public static void setRotationLock(Context context, final boolean enabled) { + protected static void setRotationLock(Context context, final boolean enabled) { rotationLockEnabled = enabled; } @Implementation - public static boolean isRotationLocked(Context context) { + protected static boolean isRotationLocked(Context context) { return rotationLockEnabled; } @Implementation - public static boolean isRotationSupported(Context context) { + protected static boolean isRotationSupported(Context context) { return rotationSupported; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java deleted file mode 100644 index d35ea5cb53589f0fedf9269b5a2ef880b045ea2f..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java +++ /dev/null @@ -1,40 +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.AsyncTask; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowAsyncTask; - -import java.util.concurrent.Executor; - -/** - * Shadow async task to handle runnables in roboletric - */ -@Implements(AsyncTask.class) -public class ShadowRunnableAsyncTask extends - ShadowAsyncTask { - - @Implementation - public AsyncTask executeOnExecutor(Executor executor, - Params... params) { - return super.execute(params); - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java deleted file mode 100644 index e0576b2e6db7182e0a40579fd771b34da69d8381..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java +++ /dev/null @@ -1,38 +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.content.Context; -import android.permission.RuntimePermissionPresenter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -@Implements(RuntimePermissionPresenter.class) -public class ShadowRuntimePermissionPresenter { - private static RuntimePermissionPresenter mRuntimePermissionPresenter; - - @Implementation - public static RuntimePermissionPresenter getInstance(Context context) { - return mRuntimePermissionPresenter; - } - - public static void setRuntimePermissionPresenter( - RuntimePermissionPresenter runtimePermissionPresenter) { - mRuntimePermissionPresenter = runtimePermissionPresenter; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java deleted file mode 100644 index e5f95c37d043ee205734e658a19e00eb27cc7766..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java +++ /dev/null @@ -1,39 +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.Bundle; - -import com.android.settings.SettingsPreferenceFragment; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * Shadow of {@link SettingsPreferenceFragment}. - * - * Override the {@link #onCreate(Bundle)} to skip a null pointer exception in - * {@link android.content.res.Resources.Theme}, much the same as {@link ShadowDashboardFragment}. - */ -@Implements(SettingsPreferenceFragment.class) -public class ShadowSettingsPreferenceFragment { - - @Implementation - public void onCreate(Bundle savedInstanceState) { - // do nothing - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java deleted file mode 100644 index 825e5aa3c4aa3abd25a59a7566cc757527d35808..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java +++ /dev/null @@ -1,65 +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 static org.robolectric.RuntimeEnvironment.application; - -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; -import org.robolectric.shadow.api.Shadow; - -import java.util.List; - -@Implements(ShortcutManager.class) -public class ShadowShortcutManager extends org.robolectric.shadows.ShadowShortcutManager { - - private List mPinnedShortcuts; - private List mLastUpdatedShortcuts; - - @Resetter - public void reset() { - mPinnedShortcuts = null; - mLastUpdatedShortcuts = null; - } - - public static ShadowShortcutManager get() { - return Shadow.extract(application.getSystemService(ShortcutManager.class)); - } - - @Implementation - public boolean updateShortcuts(List shortcutInfoList) { - mLastUpdatedShortcuts = shortcutInfoList; - return true; - } - - public List getLastUpdatedShortcuts() { - return mLastUpdatedShortcuts; - } - - @Implementation - public List getPinnedShortcuts() { - return mPinnedShortcuts; - } - - public void setPinnedShortcuts(List shortcutInfos) { - mPinnedShortcuts = shortcutInfos; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java index 366dd915eb9063a8e56e3626a3b3a5b1171c8127..a8185a412d871cba7ee528af05b9caf0c83ef15a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java @@ -48,27 +48,27 @@ public class ShadowStorageManager { } @Implementation - public VolumeInfo findVolumeById(String id) { + protected VolumeInfo findVolumeById(String id) { return createVolumeInfo(id); } @Implementation - public DiskInfo findDiskById(String id) { + protected DiskInfo findDiskById(String id) { return new DiskInfo(id, DiskInfo.FLAG_SD); } @Implementation - public VolumeRecord findRecordByUuid(String fsUuid) { + protected VolumeRecord findRecordByUuid(String fsUuid) { return createVolumeRecord(fsUuid); } @Implementation - public void unmount(String volId) { + protected void unmount(String volId) { sIsUnmountCalled = true; } @Implementation - public void forgetVolume(String fsUuid) { + protected void forgetVolume(String fsUuid) { sIsForgetCalled = true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java deleted file mode 100644 index e50a7692f474ae3701f9a6de3103f69cc4fc45a1..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSystemSettings.java +++ /dev/null @@ -1,76 +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.content.ContentResolver; -import android.provider.Settings; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.HashMap; -import java.util.Map; - -@Implements(Settings.System.class) -public class ShadowSystemSettings { - - private static final Map sValueMap = new HashMap<>(); - - @Implementation - public static boolean putInt(ContentResolver resolver, String name, int value) { - sValueMap.put(name, value); - return true; - } - - @Implementation - public static boolean putString(ContentResolver resolver, String name, String value) { - sValueMap.put(name, value); - return true; - } - - @Implementation - public static String getString(ContentResolver resolver, String name) { - return (String) sValueMap.get(name); - } - - @Implementation - public static String getStringForUser(ContentResolver resolver, String name, int userHandle) { - return getString(resolver, name); - } - - @Implementation - public static boolean putIntForUser(ContentResolver cr, String name, int value, - int userHandle) { - return putInt(cr, name, value); - } - - @Implementation - public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) { - return getInt(cr, name, def); - } - - @Implementation - public static int getInt(ContentResolver resolver, String name, int defaultValue) { - Integer value = (Integer) sValueMap.get(name); - return value == null ? defaultValue : value; - } - - public static void reset() { - sValueMap.clear(); - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java deleted file mode 100644 index b465521448a0483b35d94b3039f6604636adf699..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java +++ /dev/null @@ -1,48 +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.testutils.shadow; - -import android.icu.util.ULocale; -import android.os.SystemProperties; -import android.provider.Settings; -import android.text.TextUtils; -import android.view.View; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.Locale; - -/** - * Important: The current robolectric doesn't support API 24, so I copy the code - * from API 24 here to make it compatible. Once robolectric is upgraded to 24, - * We can delete this shadow class. - **/ -@Implements(TextUtils.class) -public class ShadowTextUtils { - - @Implementation - public static int getLayoutDirectionFromLocale(Locale locale) { - return ((locale != null && !locale.equals(Locale.ROOT) - && ULocale.forLocale(locale).isRightToLeft()) - // If forcing into RTL layout mode, return RTL as default - || SystemProperties.getBoolean(Settings.Global.DEVELOPMENT_FORCE_RTL, false)) - ? View.LAYOUT_DIRECTION_RTL - : View.LAYOUT_DIRECTION_LTR; - } - -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java index 9513098e862c10e1a12fea6875a54b383b67c42a..285d88ddb473d2f5c7bd425e5ce0dca701bce94f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowThreadUtils.java @@ -33,22 +33,21 @@ public class ShadowThreadUtils { } @Implementation - public static void postOnBackgroundThread(Runnable runnable) { + protected static void postOnBackgroundThread(Runnable runnable) { runnable.run(); } @Implementation - public static void postOnMainThread(Runnable runnable) { + protected static void postOnMainThread(Runnable runnable) { runnable.run(); } @Implementation - public static boolean isMainThread() { + protected static boolean isMainThread() { return sIsMainThread; } public static void setIsMainThread(boolean isMainThread) { sIsMainThread = isMainThread; } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java deleted file mode 100644 index 2270ff338348789aa99cbd95c3f2538659469b08..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.android.settings.testutils.shadow; - -import android.content.Intent; -import android.service.quicksettings.Tile; -import android.service.quicksettings.TileService; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadows.ShadowService; - -/** - * Shadow for {@link TileService}. - */ -@Implements(TileService.class) -public class ShadowTileService extends ShadowService { - - @RealObject TileService realService; - - private Tile mTile; - - public void __constructor__() { } - - @Implementation - public final Tile getQsTile() { - return mTile; - } - - @Implementation - public final void startActivityAndCollapse(Intent intent) { - realService.startActivity(intent); - } - - // Non-Android setter. - public void setTile(Tile tile) { - mTile = tile; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java index 1409daa23dcec62177cb792c013c0f01e2e34b24..722df7757d6a94d3c8eb0f18374e525781b3e420 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java @@ -32,19 +32,17 @@ import java.util.Map; @Implements(TileUtils.class) public class ShadowTileUtils { - public static final int ICON_RES_ID = R.drawable.ic_settings; public static final String MOCK_SUMMARY = "summary"; @Implementation - public static String getTextFromUri(Context context, String uriString, + protected static String getTextFromUri(Context context, String uriString, Map providerMap, String key) { return MOCK_SUMMARY; } @Implementation - public static Pair getIconFromUri(Context context, String packageName, + protected static Pair getIconFromUri(Context context, String packageName, String uriString, Map providerMap) { - return Pair.create(RuntimeEnvironment.application.getPackageName(), ICON_RES_ID); + return Pair.create(RuntimeEnvironment.application.getPackageName(), R.drawable.ic_settings); } - } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java deleted file mode 100644 index 2bcc92a28ad3e53c8d2ad8f89ad3ec8f6cda85a1..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTimeZoneNames.java +++ /dev/null @@ -1,35 +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.testutils.shadow; - -import android.icu.text.TimeZoneNames; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -/** - * TimeZoneNames.getDisplayName tries to access files which doesn't exist for Robolectric. Stub it - * out for a naive implementation. - */ -@Implements(TimeZoneNames.class) -public class ShadowTimeZoneNames { - - @Implementation - public String getDisplayName(String tzID, TimeZoneNames.NameType type, long date) { - return "[DisplayName]" + tzID; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java index 092795601c79d6734316e1c81914a7a9d39231f0..4797e8c68fb371a60e3111c2741174064c2e6785 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java @@ -21,13 +21,9 @@ import android.content.Context; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; -import android.util.Log; import com.android.settings.Utils; -import com.android.settings.overlay.FeatureFactory; -import com.android.settings.search.SearchFeatureProviderImpl; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -44,12 +40,12 @@ public class ShadowUtils { private static Map sAppNameMap; @Implementation - public static int enforceSameOwner(Context context, int userId) { + protected static int enforceSameOwner(Context context, int userId) { return userId; } @Implementation - public static FingerprintManager getFingerprintManagerOrNull(Context context) { + protected static FingerprintManager getFingerprintManagerOrNull(Context context) { return sFingerprintManager; } @@ -80,7 +76,7 @@ public class ShadowUtils { * Returns true if Monkey is running. */ @Implementation - public static boolean isMonkeyRunning() { + protected static boolean isMonkeyRunning() { return sIsUserAMonkey; } @@ -89,17 +85,17 @@ public class ShadowUtils { } @Implementation - public static ComponentName getDeviceOwnerComponent(Context context) { + protected static ComponentName getDeviceOwnerComponent(Context context) { return sDeviceOwnerComponentName; } @Implementation - public static int getManagedProfileId(UserManager um, int parentUserId) { + protected static int getManagedProfileId(UserManager um, int parentUserId) { return UserHandle.USER_NULL; } @Implementation - public static CharSequence getApplicationLabel(Context context, String packageName) { + protected static CharSequence getApplicationLabel(Context context, String packageName) { if (sAppNameMap != null) { return sAppNameMap.get(packageName); } @@ -107,7 +103,7 @@ public class ShadowUtils { } @Implementation - public static boolean isPackageEnabled(Context context, String packageName) { + protected static boolean isPackageEnabled(Context context, String packageName) { return true; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java index b41b396dd66f91757be2d188bf1d7972ce50aaff..19cdfe327aa51d2ed20901e230c28c290390b7ed 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java @@ -37,23 +37,23 @@ public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager @HiddenApi // @SystemApi @Implementation - public void connect(WifiConfiguration config, WifiManager.ActionListener listener) { + protected void connect(WifiConfiguration config, WifiManager.ActionListener listener) { savedWifiConfig = config; } @HiddenApi @Implementation - public void save(WifiConfiguration config, WifiManager.ActionListener listener) { + protected void save(WifiConfiguration config, WifiManager.ActionListener listener) { savedWifiConfig = config; } @Implementation - public List getPasspointConfigurations() { + protected List getPasspointConfigurations() { return Collections.emptyList(); } @Implementation - public boolean isDualModeSupported() { + protected boolean isDualModeSupported() { return false; } diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java index 8c383470ab6297882267077c31fb41568cf575ba..2fd8f6b5e3690e765e48f579a01ece7c067e18c5 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiP2pManager.java @@ -23,18 +23,15 @@ import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; /** - * Shadown class for WifiP2pManager. + * Shadow class for WifiP2pManager. */ @Implements(value = WifiP2pManager.class) public class ShadowWifiP2pManager extends org.robolectric.shadows.ShadowWifiP2pManager { private static int sFactoryResetCount; - /** - * factoryReset mock method. - */ @Implementation - public void factoryReset(WifiP2pManager.Channel c, WifiP2pManager.ActionListener listener) { + protected void factoryReset(WifiP2pManager.Channel c, WifiP2pManager.ActionListener listener) { if (c != null) { sFactoryResetCount++; } else { @@ -42,9 +39,6 @@ public class ShadowWifiP2pManager extends org.robolectric.shadows.ShadowWifiP2pM } } - /** - * Reset variables in shadow class. - */ @Resetter public static void reset() { sFactoryResetCount = 0; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java deleted file mode 100644 index 655acf14798099114f1add78ed38fd006deb5ad7..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetter.java +++ /dev/null @@ -1,53 +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.content.Context; - -import com.android.settingslib.datetime.ZoneGetter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; - -@Implements(ZoneGetter.class) -public class ShadowZoneGetter { - - @Implementation - public static List> getZonesList(Context context) { - List> zones = new ArrayList<>(); - zones.add(createDisplayEntry(TimeZone.getDefault(), "gmt-1:00", "FakePlace", 10000)); - return zones; - } - - private static Map createDisplayEntry( - TimeZone tz, CharSequence gmtOffsetText, CharSequence displayName, int offsetMillis) { - Map map = new HashMap<>(); - map.put(ZoneGetter.KEY_ID, tz.getID()); - map.put(ZoneGetter.KEY_DISPLAYNAME, displayName.toString()); - map.put(ZoneGetter.KEY_DISPLAY_LABEL, displayName); - map.put(ZoneGetter.KEY_GMT, gmtOffsetText.toString()); - map.put(ZoneGetter.KEY_OFFSET_LABEL, gmtOffsetText); - map.put(ZoneGetter.KEY_OFFSET, offsetMillis); - return map; - } -} diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java deleted file mode 100644 index 1e6dbcedaf364bce88eb64c944d28e7af9acaa03..0000000000000000000000000000000000000000 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowZoneGetterData.java +++ /dev/null @@ -1,52 +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.icu.util.TimeZone; - -import com.android.settingslib.datetime.ZoneGetter; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Implements(ZoneGetter.ZoneGetterData.class) -public class ShadowZoneGetterData { - private static final Map> TIME_ZONE_LOOKUP = new HashMap<>(); - - static { - TIME_ZONE_LOOKUP.put("FR", Collections.singletonList( - TimeZone.getTimeZone("Europe/Paris", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("ML", Collections.singletonList( - TimeZone.getTimeZone("Europe/Amsterdam", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("US", Arrays.asList( - TimeZone.getTimeZone("America/New_York", TimeZone.TIMEZONE_JDK).getID())); - TIME_ZONE_LOOKUP.put("JP", Collections.singletonList( - TimeZone.getTimeZone("Asia/Tokyo", TimeZone.TIMEZONE_JDK).getID())); - } - - @Implementation - public List lookupTimeZoneIdsByCountry(String country) { - return TIME_ZONE_LOOKUP.get(country); - } -} diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 8093af57644a5050d3c54852ea03043c72d73266..dd0260b6604366f832b66fe2c522ae8f084792b8 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.provider.Settings.Global; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedSwitchPreference; @@ -36,10 +35,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class AddUserWhenLockedPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index a7915283d9188577bd643d9f816d90bb4088a9be..95fc3f806378e0e8d59769ff8655346915b43fd3 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -18,7 +18,7 @@ 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.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -31,20 +31,19 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncDataPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 1850f3a2253bef64f2b66cde85c19f92ffa0b5a9..70f516552a5862fc396119539e38dc692ec9ee9e 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -18,7 +18,7 @@ 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.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,20 +29,19 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncPersonalDataPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 9e185f591844ef510a1cd8df34fc8291fdd8be0a..21b47590dfbb63aef6efde64377b215b17e60e73 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -19,7 +19,7 @@ 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; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import android.content.Context; @@ -29,8 +29,6 @@ import android.os.UserManager; import androidx.fragment.app.Fragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -39,8 +37,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AutoSyncWorkDataPreferenceControllerTest { private static final int MANAGED_PROFILE_ID = 10; diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java index cd33b3907d4cadbce5e7b51115db637e8626794a..b9dfbbbc8c3a8781006c329d5b06debe45be5f90 100644 --- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java @@ -38,7 +38,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -46,9 +45,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.android.controller.ActivityController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EditUserInfoControllerTest { @Mock private Fragment mFragment; @@ -69,7 +69,7 @@ public class EditUserInfoControllerTest { public class TestEditUserInfoController extends EditUserInfoController { private EditUserPhotoController mPhotoController; - public EditUserPhotoController getPhotoController() { + private EditUserPhotoController getPhotoController() { return mPhotoController; } diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java index 94330a9124ab2134bd2b862dea970574b6fa0ead..8342cf06e70be3e79dea5e73bdc8719c3d959cec 100644 --- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java @@ -23,14 +23,15 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) +@Ignore public class MultiUserFooterPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index 894def75a675aa7c1fb663fb98b9f93f9368cfa4..382ac5d364efaafcb6d277540a8719dd56f6e92f 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -22,17 +22,16 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class}) public class UserCapabilitiesTest { diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index abdf4f513ff8c28a936621d9e1b9a4bb134e3a23..36f0591da000c3d995a65f0bacdd958f6298bb94 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -24,8 +24,6 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,8 +32,9 @@ import org.mockito.MockitoAnnotations; import java.util.Arrays; import java.util.List; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UserFeatureProviderImplTest { private static final int FIRST_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ed79cf22ea9b84790a3e9eceddf0d74ae8207e8a..345784aa51eebd4a01a0084350eeb06510a613d2 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.content.Context; import android.os.UserHandle; import android.view.View; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreferenceHelper; import org.junit.Before; @@ -33,10 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 62135fefb48c0d932b12e2cd146be2aee646beb3..b682388dde98c1b84830d92ac8999e824ff5f65f 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -19,9 +19,9 @@ package com.android.settings.users; 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; import static org.mockito.ArgumentMatchers.notNull; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -51,18 +51,19 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreference; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.AdditionalMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; @@ -71,12 +72,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) -@Config( - shadows = { - ShadowUserManager.class, - ShadowDevicePolicyManager.class - }) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class}) public class UserSettingsTest { private static final String KEY_USER_GUEST = "user_guest"; @@ -209,6 +206,7 @@ public class UserSettingsTest { } @Test + @Ignore public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); @@ -303,6 +301,7 @@ public class UserSettingsTest { } @Test + @Ignore public void updateUserList_canAddUserAndSwitchUser_shouldShowAddUser() { Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); @@ -326,7 +325,5 @@ public class UserSettingsTest { mFragment.updateUserList(); verify(addUser).setVisible(true); - } - } diff --git a/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java b/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java index f1386a5ef89db8e649ed8a47dab1cf7f46230086..c5db9ae07e3530b724a116a451db4c1675e3a702 100644 --- a/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java +++ b/tests/robotests/src/com/android/settings/utils/AnnotationSpanTest.java @@ -22,16 +22,15 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AnnotationSpanTest { private Intent mTestIntent; diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java index 23938a5ccae41034ab82036a4a5fb6ca5abb4b0e..f7702be0ffac87b00b79bd217f39020fc40685c6 100644 --- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java +++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java @@ -20,13 +20,12 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LocalClassLoaderContextThemeWrapperTest { private LocalClassLoaderContextThemeWrapper mContextThemeWrapper; diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java index 8736d75975edbf8d9c21cdb8cecf32b1b2007791..2b81f1683bc6904bef84728c8da772f79bf42fe1 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -23,15 +23,14 @@ import android.content.pm.PackageInfo; import androidx.fragment.app.Fragment; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppDialogFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index f8c08eaf27ef6f0bc89e3ed087db20aa03cf09e1..7856b06a0b3b7d70430abedad5a3126f730f68f9 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.when; import android.net.ConnectivityManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public final class VpnUtilsTest { @Test public void testIsAlwaysOnVpnSet() { diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java index 686eb82faf685c05c4b6a34fa0bef2b508a357ab..b89f4b37a40df2a3721aeeef02fb3593df6acd5e 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -20,20 +20,23 @@ import static com.google.common.truth.Truth.assertThat; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.Application; import android.app.WallpaperColors; import android.app.WallpaperManager; import android.app.WallpaperManager.OnColorsChangedListener; +import android.content.Context; import android.os.Handler; import com.android.settings.FallbackHome; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; @@ -42,12 +45,9 @@ import org.robolectric.shadow.api.Shadow; import java.util.ArrayList; import java.util.List; +import org.robolectric.shadows.ShadowApplication; -/** - * Build/Install/Run: - * make RunSettingsRoboTests -j40 ROBOTEST_FILTER=FallbackHomeActivityTest - */ -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FallbackHomeActivityTest { private ActivityController mController; @@ -55,6 +55,12 @@ public class FallbackHomeActivityTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + + final Application application = RuntimeEnvironment.application; + WallpaperManager wallpaperManager = WallpaperManager.getInstance(application); + ShadowApplication shadowApplication = Shadows.shadowOf(application); + shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wallpaperManager); + mController = Robolectric.buildActivity(FallbackHome.class); } @@ -73,7 +79,8 @@ public class FallbackHomeActivityTest { } @Implements(WallpaperManager.class) - public static class ShadowWallpaperManager { + public static class ShadowWallpaperManager extends + org.robolectric.shadows.ShadowWallpaperManager { private final List mListener = new ArrayList<>(); @@ -82,23 +89,23 @@ public class FallbackHomeActivityTest { } @Implementation - public boolean isWallpaperServiceEnabled() { + protected boolean isWallpaperServiceEnabled() { return true; } @Implementation - public @Nullable WallpaperColors getWallpaperColors(int which) { + protected @Nullable WallpaperColors getWallpaperColors(int which) { return null; } @Implementation - public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener, + protected void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener, @NonNull Handler handler) { mListener.add(listener); } @Implementation - public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { + protected void removeOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { mListener.remove(listener); } } diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index 67d5dc609778cda894bea3297d2b0ec01304bb3f..54a41a3935a897c5b4be567501d4e3a3d91d3cbf 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -20,27 +20,27 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; +import android.app.Application; import android.app.WallpaperManager; import android.content.Context; import android.content.res.Resources; -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.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.android.controller.ActivityController; +import org.robolectric.Shadows; 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; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperSuggestionActivityTest { @Mock @@ -48,12 +48,14 @@ public class WallpaperSuggestionActivityTest { @Mock private Resources mResources; - private ActivityController mController; - @Before public void setUp() { MockitoAnnotations.initMocks(this); - mController = Robolectric.buildActivity(WallpaperSuggestionActivity.class); + + final Application application = RuntimeEnvironment.application; + WallpaperManager wallpaperManager = WallpaperManager.getInstance(application); + ShadowApplication shadowApplication = Shadows.shadowOf(application); + shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wallpaperManager); } @After @@ -89,7 +91,8 @@ public class WallpaperSuggestionActivityTest { } @Implements(WallpaperManager.class) - public static class ShadowWallpaperManager { + public static class ShadowWallpaperManager extends + org.robolectric.shadows.ShadowWallpaperManager { private static int sWallpaperId; @@ -103,12 +106,12 @@ public class WallpaperSuggestionActivityTest { } @Implementation - public boolean isWallpaperServiceEnabled() { + protected boolean isWallpaperServiceEnabled() { return true; } @Implementation - public int getWallpaperId(int which) { + protected int getWallpaperId(int which) { return sWallpaperId; } } diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index e5519a314b8974d4714c4900977b993cd246d379..8871cc8bb2711a506f6dbf370892be9d87591921 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -25,15 +25,15 @@ import android.content.Intent; import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; -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.Robolectric; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WallpaperTypePreferenceControllerTest { private Context mContext; @@ -57,7 +57,7 @@ public class WallpaperTypePreferenceControllerTest { } @Test - public void testhandlePreferenceTreeClick_intentNull_shouldDoNothing() { + public void testHandlePreferenceTreeClick_intentNull_shouldDoNothing() { mPreference.setIntent(null); final boolean handled = mController.handlePreferenceTreeClick(mPreference); @@ -66,7 +66,7 @@ public class WallpaperTypePreferenceControllerTest { } @Test - public void testhandlePreferenceTreeClick_shouldLaunchIntent() { + public void testHandlePreferenceTreeClick_shouldLaunchIntent() { mPreference.setIntent(mIntent); final boolean handled = mController.handlePreferenceTreeClick(mPreference); diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 73d6b4a50cb6e8792d49a1b58f728113b7eebaba..1435529a784ecf95560e1ccd9df90ae991763350 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -20,9 +20,9 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -44,7 +44,6 @@ import android.webkit.UserPackage; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -55,13 +54,14 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; import java.util.Collections; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WebViewAppPickerTest { private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME"; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index 3ae29d36bd6d9ade497bad60daecae9c4c98fd23..a76a1df2ac15e985e665941254beafe139d1b45a 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -32,15 +32,15 @@ import android.net.wifi.p2p.WifiP2pManager; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; -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.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiDisplaySettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 454813fb14fcce058cb9a566b4f670a5346c8583..befac3fa2bc937fa06935a88df8cf6c3bb096926 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -21,7 +21,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -33,7 +33,6 @@ import android.view.View; import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -41,9 +40,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ActionBarShadowControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java index 5b72a51e9646307c3ef905b263c8fbfe26fc7ab4..57c6e01749e6cfefa782f48cac14613284c9c369 100644 --- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java @@ -25,14 +25,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppCheckBoxPreferenceTest { private static final String SUMMARY = "summary info"; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index ce366fe78de227018fb7b2f51988a0e68c708953..aa5e3e768a29b9846b897ce80fb9df0a86f8b761 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -24,14 +24,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 59a90c561f46ff637ca002134825bf85552f37f2..492a3273c6b45404067f0bcb447974204b35ac9a 100644 --- a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java +++ b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java @@ -21,15 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AspectRatioFrameLayoutTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java index 7b7bcfaa401d5a1e2316ddc1f84db2417e1305b0..ea0d89ad81f9b9a06b3400aeb86a0b548c6113c1 100644 --- a/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java +++ b/tests/robotests/src/com/android/settings/widget/BottomLabelLayoutTest.java @@ -23,14 +23,14 @@ import android.widget.LinearLayout; import android.widget.Space; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class BottomLabelLayoutTest { private BottomLabelLayout mBottomLabelLayout; diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java index 480b53d736175b1417590dd92b07dd96ddd6aeb6..ac95afa53a1bff102f31ffc860a17431013bea38 100644 --- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java @@ -16,17 +16,16 @@ package com.android.settings.widget; -import static junit.framework.Assert.assertEquals; - -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DefaultIndicatorSeekBarTest { private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 02add358f97062bc8950ff2ab6c28242290b1254..4762306d99bebc2ac49f32c4b9de0cab0eb72e5c 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -18,7 +18,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -33,14 +33,13 @@ import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; import androidx.preference.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java b/tests/robotests/src/com/android/settings/widget/DonutViewTest.java index 3b8bdceeb931c229e651a9d383f388f007f19748..cc41f92acf98884fc19868054284408d61b8d1ab 100644 --- a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java +++ b/tests/robotests/src/com/android/settings/widget/DonutViewTest.java @@ -2,13 +2,12 @@ package com.android.settings.widget; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class DonutViewTest { @Test public void getPercentageStringSpannable_doesntCrashForMissingPercentage() { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 56395493483cdace7696d430fe6088dd1a2c6ce3..1d600a49f99401dcf8f9b55b69408fbb5094c353 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -18,9 +18,9 @@ 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; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -46,8 +46,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.ShadowIconDrawableFactory; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.widget.LayoutPreference; @@ -57,10 +55,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class EntityHeaderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -260,7 +258,6 @@ public class EntityHeaderControllerTest { } @Test - @Config(shadows = ShadowIconDrawableFactory.class) public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() { final View view = mLayoutInflater .inflate(R.layout.settings_entity_header, null /* root */); @@ -270,9 +267,7 @@ public class EntityHeaderControllerTest { mController.setIcon(entry).done(mActivity); final ImageView iconView = view.findViewById(R.id.entity_header_icon); - // Icon is set - assertThat(iconView.getDrawable()).isNotNull(); - // ... and entry.icon is still empty. This means the icon didn't come from cache. + // ... entry.icon is still empty. This means the icon didn't come from cache. assertThat(entry.icon).isNull(); } diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 3cbbbbec7d5d4dd8c817894d8b23efe22ce83304..58005165a9f6f73b6b7fa627620460b5bd88f990 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -27,16 +27,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FixedLineSummaryPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java b/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java index 6acc4d984fe1f90a3e6400ce52e40b0488909ecd..be63fab54e7763e242d4cdd9d840ec98740b3420 100644 --- a/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java +++ b/tests/robotests/src/com/android/settings/widget/FloatingAppBarScrollingViewBehaviorTest.java @@ -23,7 +23,6 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.android.material.appbar.AppBarLayout; @@ -31,9 +30,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class FloatingAppBarScrollingViewBehaviorTest { private FloatingAppBarScrollingViewBehavior mScrollingViewBehavior; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index 79f344d92205df4a8839de14f6f341b1d9b60ff8..bf6b95ebe55704190053783a88712b0716bb1c22 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -40,17 +40,17 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class HighlightablePreferenceGroupAdapterTest { private static final String TEST_KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 07a0aa97ba10410c115fa1271da3b35ea519c007..022ccef6affe7d68140ba79691e2e38cf7e15651 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,15 +27,14 @@ 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LoadingViewControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index e5cff2172a18c270d64760622f1440c0d446c33c..16818b40caf4d2d6120898f27b09f9a5aa585807 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -31,14 +31,14 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MasterCheckBoxPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 04b30892558f66846b0bc74b4761bec13ca42bfb..1ddabc15983959d8eedaa8b52793e5969f5e5e4a 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -31,15 +31,15 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceViewHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class MasterSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 92f75e99e3e7c2ade98ff5707bdbcd1d68b5073f..59cd13d753d297e6542ddf7215a329e381f915b5 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -23,18 +23,18 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 55d212ffef1f41e999acbf2f12ee0514c8099b1f..56a5f7a7c58318020751dc60624f6a41a9105c22 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -31,7 +31,6 @@ import android.os.UserManager; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; @@ -42,15 +41,15 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RadioButtonPickerFragmentTest { - @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Activity mActivity; @Mock diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 8a6aabf5d4a44769e7085bf4920e6c7e14ae859c..c7b7e47f15a892743821bb40a167f44ba57e866d 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -18,7 +18,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,14 +30,14 @@ import android.view.View; import androidx.preference.PreferenceViewHolder; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RadioButtonPreferenceTest { private Application mContext; diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java index 8dc78a5740b9aab01fac5e03e6d1a8d81b2db0ff..1d76f1bf332293a73d83da21474d4af323c7442a 100644 --- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java @@ -16,21 +16,19 @@ package com.android.settings.widget; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import android.content.Context; import android.view.View.MeasureSpec; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) -@org.robolectric.annotation.Config(shadows = SettingsShadowResourcesImpl.class) +@RunWith(RobolectricTestRunner.class) public class RingProgressBarTest { private Context mContext = RuntimeEnvironment.application; @@ -62,7 +60,7 @@ public class RingProgressBarTest { @Test public void testDefaultAttributes() { - assertEquals(false, mProgressBar.isIndeterminate()); + assertFalse(mProgressBar.isIndeterminate()); assertEquals(0, mProgressBar.getProgress()); assertEquals(10000, mProgressBar.getMax()); } diff --git a/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java index 5bc8ddae4fbcba43edd9bbecff2504b1c25daca4..21ba907e6214840bcef47dbc87697dcffdbcf664 100644 --- a/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java +++ b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java @@ -37,7 +37,6 @@ import android.graphics.drawable.ShapeDrawable; import android.os.Bundle; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.Tile; import com.android.settingslib.testutils.DrawableTestHelper; @@ -45,9 +44,10 @@ import com.android.settingslib.testutils.DrawableTestHelper; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RoundedHomepageIconTest { private Context mContext; @@ -112,5 +112,4 @@ public class RoundedHomepageIconTest { assertThat(icon.mBackgroundColor) .isEqualTo(mContext.getColor(R.color.material_blue_500)); } - } diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index 7edfd0be636c54ddfc341212e12ecff87463a70a..8cb0539a30e951314d60d2b100b3dc6316ef4766 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -25,16 +25,15 @@ import android.view.ViewGroup; import androidx.viewpager.widget.PagerAdapter; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.Locale; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class RtlCompatibleViewPagerTest { private Locale mLocaleEn; @@ -81,7 +80,7 @@ public class RtlCompatibleViewPagerTest { private static final int ITEM_COUNT = 2; - public ViewPagerAdapter() { + private ViewPagerAdapter() { } @Override diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 20405ab6fac16a891388fe0abb08a3a61a0c98d4..b32e32c6a091c1161a392fd331dfcd2d1f015732 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -18,9 +18,9 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,16 +29,15 @@ import static org.robolectric.RuntimeEnvironment.application; import android.graphics.Rect; import android.widget.FrameLayout; -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.RobolectricTestRunner; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowView; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ScrollToParentEditTextTest { private static final int EDIT_TEXT_SIZE = 20; diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java index 8f7063c5289e999b5803c99cc7ce85ee6facf4fd..a675e0231bc9ed28005bb1410120dd218d7d3966 100644 --- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java @@ -21,14 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcelable; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SeekBarPreferenceTest { private static final int MAX = 75; diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java index d91b0f86cf4e56a7fe0b425c1eb7b2106fc0c940..9aaabc9673c05232d079a92d57a5c3be09cd2731 100644 --- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java @@ -21,16 +21,15 @@ import static org.mockito.Mockito.verify; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SummaryUpdaterTest { private Context mContext; @@ -112,7 +111,7 @@ public class SummaryUpdaterTest { return mTestSummary; } - public void setTestSummary(String summary) { + private void setTestSummary(String summary) { mTestSummary = summary; } } diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index 04b85dc50db43acb66952888b2eed4a7fc664ea7..35fa2c66a6d70fa51c52c27446157fcf029b3f4a 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -25,16 +25,16 @@ import android.graphics.drawable.ColorDrawable; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SwitchBarTest { private static final int COLOR_BACKGROUND = 1; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index e1c500211ea8e532c604f0ac75e514ddf7b40674..f337990d071a69ebaa3a3b9c323adff00de7778d 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -26,16 +26,16 @@ import android.view.View; import android.widget.Button; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TwoStateButtonPreferenceTest { private TwoStateButtonPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index ae55217b6990d163244ee8929b89c0470b9e6b53..029de613bbcac1332b0c619d2b57ddcb368f25b6 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -26,19 +26,19 @@ import android.widget.ArrayAdapter; import androidx.preference.ListPreference; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; 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; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { @@ -78,15 +78,13 @@ public class UpdatableListPreferenceDialogFragmentTest { @Test public void onListPreferenceUpdated_verifyAdapterCanBeUpdate() { - assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()). - isEqualTo(0); + assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(0); ListPreference listPreference = new ListPreference(mContext); final CharSequence[] charSequences = {"Test_DEVICE_1", "Test_DEVICE_2"}; listPreference.setEntries(charSequences); mUpdatableListPrefDlgFragment.onListPreferenceUpdated(listPreference); - assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()). - isEqualTo(2); + assertThat(mUpdatableListPrefDlgFragment.getAdapter().getCount()).isEqualTo(2); } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java index 4b23e7f862784cc06bae83effc0b1f6050bc495b..7f09c3b88fb277504f917482031eb9502d4370ea 100644 --- a/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java +++ b/tests/robotests/src/com/android/settings/widget/UsageGraphTest.java @@ -26,15 +26,15 @@ import android.content.Context; import android.content.res.Resources; import android.util.SparseIntArray; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UsageGraphTest { private UsageGraph mGraph; diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 80d25391494b2097a0a0c427d843166a8e816bd8..4412ac80486c4cd638dad0611a4e0c028c21fe04 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -18,8 +18,8 @@ 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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -33,16 +33,15 @@ import android.widget.TextView; import androidx.preference.PreferenceViewHolder; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java index 902b8ae861662e6ca6e2880c56316c4af3520371..7fa2d282295f3c408d89f72ff12c277b54ddf1c8 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java @@ -73,5 +73,4 @@ public class VideoPreferenceControllerTest { verify(mPreference).onViewVisible(anyBoolean()); } - } diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index 764de18929b50a69b1a68f98f61be238e1f5b6c2..396b9df8520a944e5bc56a61fa06c1b959d4136b 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -32,16 +32,16 @@ import android.view.TextureView; import androidx.preference.PreferenceViewHolder; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class VideoPreferenceTest { private static final int VIDEO_WIDTH = 100; private static final int VIDEO_HEIGHT = 150; diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java index 2b4b4bef3b0228db2e35b9a91699e174d8fa473b..db699e5ae99abf2510c4f0956bcb678e9f175e01 100644 --- a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java @@ -24,17 +24,17 @@ import static org.mockito.Mockito.verify; import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AddNetworkFragmentTest { diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index b65e5aefc0b7e8d1ee3033e8c53caba8fcc75f1f..c32c76b45d38d02cf64509d479ea29a1147e540c 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.mock; import android.Manifest; import android.content.pm.PackageInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; @@ -31,8 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class AppStateChangeWifiStateBridgeTest { @Mock @@ -77,7 +77,7 @@ public class AppStateChangeWifiStateBridgeTest { mState.permissionDeclared = true; mState.packageInfo = mock(PackageInfo.class); mState.packageInfo.requestedPermissions - = new String[]{ Manifest.permission.NETWORK_SETTINGS }; + = new String[] { Manifest.permission.NETWORK_SETTINGS }; mEntry.extraInfo = mState; assertThat(mFilter.filterApp(mEntry)).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index 91598c010c29cddecd15bbe1842718d1b08e22e7..c5bd555fa9a5f2ddccd2b29194bc8f71abb07a11 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -22,16 +22,15 @@ import static org.mockito.Mockito.when; 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.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class CellularFallbackPreferenceControllerTest { private static final String KEY_CELLULAR_FALLBACK = "wifi_cellular_data_fallback"; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 6d8996068e4c003fd2999a6c3b879a68d0954b04..ad38413ed0edf167cee771ff91d8ad966c206035 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -17,8 +17,8 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,16 +27,16 @@ import android.content.Context; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; 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.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ChangeWifiStateDetailsTest { private static final String PACKAGE_NAME = "app"; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index be8eeae93d54b760718e6de7202920bdcb8850b8..2e3a111cd15a9404fbf455a154fe83e56544443e 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -11,18 +11,18 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; 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; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConfigureWifiSettingsTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java index 452fe0346da7d5719dd989d80a7c871c4af14e5d..c4fae41f5a50ca238ae7152cf123601b8f9a8d67 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.view.View; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wifi.AccessPoint; import org.junit.Before; @@ -34,9 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class ConnectedAccessPointPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 94f10ddd88bca674a21066886ef5b90900b82d4d..2bb2ee2b92fcfbb2625b10e69d83269122e8ee71 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -28,15 +28,15 @@ import androidx.preference.PreferenceViewHolder; import com.android.settings.LinkifyUtils; 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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class LinkablePreferenceTest { private static final String TITLE = "Title"; diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java index 4889c830d607c1297bf5f361ffab0e08819aa329..48f8ec0099daf4104a6a433c661f13086437c4be 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java @@ -20,26 +20,21 @@ import static com.google.common.truth.Truth.assertThat; import androidx.appcompat.app.AlertDialog; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestDialogActivityTest { @Test public void LaunchActivity_shouldShowNetworkRequestDialog() { - NetworkRequestDialogActivity activity = Robolectric - .setupActivity(NetworkRequestDialogActivity.class); + Robolectric.setupActivity(NetworkRequestDialogActivity.class); AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java index 8cf02b829641b6f21086a104e4692f4141b306e4..c9cdc154356ba247d8219a54bccb5005f9c039fd 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java @@ -37,8 +37,6 @@ import android.widget.Button; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; import com.android.settingslib.wifi.AccessPoint; @@ -50,18 +48,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; - -import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; - import org.robolectric.shadows.ShadowLooper; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestDialogFragmentTest { - final String KEY_SSID = "key_ssid"; + private static final String KEY_SSID = "key_ssid"; private FragmentActivity mActivity; private NetworkRequestDialogFragment networkRequestDialogFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java index c6659a5e3cf3a7cf07abd824fde6923d0da084ff..303f6af6721a265860bdbca8dee859d2be9de06a 100644 --- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java @@ -30,8 +30,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentActivity; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE; @@ -39,13 +37,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; - -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowAlertDialogCompat.class) public class NetworkRequestErrorDialogFragmentTest { private FragmentActivity mActivity; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index bf4c6e7afdf68bbdbed5dd685be518d56bcc2842..2cf7b21569d9026aef4835828632bc30f7fe024f 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -29,16 +29,16 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.SwitchPreference; -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.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class NotifyOpenNetworkPreferenceControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index b44d8e2a0c6ea9db9fb68451903a09bcce5823ac..47f1c2624604307fec9d73da9de7ad36058f02d9 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -24,7 +24,7 @@ import static com.android.settings.wifi.UseOpenWifiPreferenceController import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -43,7 +43,6 @@ import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import com.google.common.collect.Lists; @@ -56,13 +55,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class UseOpenWifiPreferenceControllerTest { private static ComponentName sEnableActivityComponent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 411e68e4c9ca638b7a7c6831eb67532835af32b7..7ebb18e800475d9783977efb398dcf85c34b561b 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -39,7 +38,6 @@ import android.widget.Spinner; import android.widget.TextView; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settingslib.wifi.AccessPoint; @@ -48,10 +46,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class WifiConfigControllerTest { @@ -141,7 +140,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(LONG_PSK); assertThat(mController.isSubmittable()).isFalse(); - } @Test @@ -158,7 +156,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(GOOD_PSK); assertThat(mController.isSubmittable()).isTrue(); - } @Test @@ -167,7 +164,6 @@ public class WifiConfigControllerTest { assertThat(password).isNotNull(); password.setText(HEX_PSK); assertThat(mController.isSubmittable()).isTrue(); - } @Test @@ -324,14 +320,14 @@ public class WifiConfigControllerTest { private void securitySpinnerTestHelper(boolean saeVisible, boolean suitebVisible, boolean oweVisible) { WifiManager wifiManager = mock(WifiManager.class); - when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible ? true : false); - when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible ? true : false); - when(wifiManager.isOweSupported()).thenReturn(oweVisible ? true : false); + when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible); + when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible); + when(wifiManager.isOweSupported()).thenReturn(oweVisible); mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */, WifiConfigUiBase.MODE_MODIFY, wifiManager); - final Spinner securitySpinner = ((Spinner) mView.findViewById(R.id.security)); + final Spinner securitySpinner = mView.findViewById(R.id.security); final ArrayAdapter adapter = (ArrayAdapter) securitySpinner.getAdapter(); boolean saeFound = false; boolean suitebFound = false; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 6535685b2216e14d3afa9aa45ecf9b67220184db..d7f8ef89593367b222b2d0e1cd27c20a06d23ec6 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -23,10 +23,6 @@ import static org.mockito.Mockito.doReturn; import android.content.Intent; import android.net.wifi.WifiConfiguration; -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.SettingsShadowTypedArray; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowWifiManager; @@ -37,17 +33,15 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { - SettingsShadowResources.SettingsShadowTheme.class, ShadowConnectivityManager.class, - SettingsShadowTypedArray.class, ShadowWifiManager.class, - ShadowAlertDialogCompat.class, - SettingsShadowResourcesImpl.class + ShadowAlertDialogCompat.class }) public class WifiDialogActivityTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java index 6974a59cd789b6928ee1588ca5d0d872501c6249..4ce29aa57c97e5e8a27f9845a8aa5ea2fd3c7d16 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java @@ -4,7 +4,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -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; @@ -14,10 +13,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.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 53b3a648b098c91bdbfff56a8146c58a54cd4f20..65cc8111e3621d6085e997a550511e462ed8c3c5 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.SwitchWidgetController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -35,9 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class WifiEnablerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 6cbace92cf8f093142b8a4cc36276d5969012931..c4a5c787d8fa220d2e4a2be1a47cce86014740f2 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -21,8 +21,8 @@ import static androidx.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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -38,7 +38,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -47,10 +46,13 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiInfoPreferenceControllerTest { + private static final String TEST_MAC_ADDRESS = "42:0a:23:43:ac:02"; + @Mock private Context mContext; @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -68,8 +70,6 @@ public class WifiInfoPreferenceControllerTest { private LifecycleOwner mLifecycleOwner; private WifiInfoPreferenceController mController; - private static final String TEST_MAC_ADDRESS = "42:0a:23:43:ac:02"; - @Before public void setUp() { MockitoAnnotations.initMocks(this); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 5aef03653ad56c5fa3995ff668833b135748335a..4db63e7d3ef4013bc5a9d8263a4b6d42f555c0a4 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; @@ -46,10 +45,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtilsInternal.class) public class WifiMasterSwitchPreferenceControllerTest { @@ -92,7 +92,6 @@ public class WifiMasterSwitchPreferenceControllerTest { assertThat(mController.isAvailable()).isFalse(); } - @Test public void onResume_shouldRegisterCallback() { mController.onResume(); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index e50d9ad1f0f66cd43d8bdff007cab00796305a04..9291e0bb3f2320087eb146d546788def19d86900 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -37,27 +37,25 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiScanningRequiredFragmentTest { private WifiScanningRequiredFragment mFragment; private Context mContext; private ContentResolver mResolver; @Mock - Fragment mCallbackFragment; + private Fragment mCallbackFragment; @Mock - AlertDialog.Builder mBuilder; + private AlertDialog.Builder mBuilder; @Before public void setUp() { @@ -71,11 +69,6 @@ public class WifiScanningRequiredFragmentTest { Settings.Global.putInt(mResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void onClick_positiveButtonSetsWifiScanningOn() throws Settings.SettingNotFoundException { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index c9e6c1e19445c254b5c02c67f19270b33828c052..22ccd3c22952a7bedf159b449a8b1b648f58c8e8 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -36,7 +36,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wifi.WifiTracker; import org.junit.Before; @@ -44,13 +43,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSettingsTest { private static final int NUM_NETWORKS = 4; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java index fb98f85400edf1d883882f28309748e709ee9874..2d4dd045f38495b23d49f7fc849d8ce06c5ac68a 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java @@ -46,17 +46,17 @@ import androidx.slice.core.SliceQuery; import androidx.slice.widget.SliceLiveData; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSliceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index d40ead143be49d4b1322d5376ee72168df6b7acd..02bf172e89159484a103b89ef2bd47625b442fe3 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -18,8 +18,8 @@ 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,7 +30,6 @@ import android.content.IntentFilter; import android.net.wifi.WifiManager; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener; import com.android.settingslib.wifi.WifiStatusTracker; @@ -39,9 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiSummaryUpdaterTest { @Mock private WifiStatusTracker mWifiTracker; @Mock private SummaryListener mListener; @@ -49,7 +49,6 @@ public class WifiSummaryUpdaterTest { private Context mContext; private WifiSummaryUpdater mSummaryUpdater; - @Before public void setUp() { MockitoAnnotations.initMocks(this); @@ -127,7 +126,7 @@ public class WifiSummaryUpdaterTest { } private class SummaryListener implements OnSummaryChangeListener { - String summary; + private String summary; @Override public void onSummaryChanged(String summary) { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java index 806399d191fac0f1d04d56a61a572ff728251ce4..a95624b7ecc727e84bf5bb8200150d1bbdbd43dc 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java @@ -18,12 +18,11 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiUtilsTest { @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 6deae7f5c1051303c6dff6331462efd49e6a5736..166b29b0d591e0254468616a7ecb2670934023f6 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -22,30 +22,27 @@ import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; 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.verify; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; +import android.text.TextUtils; import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResources; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiWakeupPreferenceControllerTest { private Context mContext; @@ -69,11 +66,6 @@ public class WifiWakeupPreferenceControllerTest { doReturn(true).when(mLocationManager).isLocationEnabled(); } - @After - public void tearDown() { - SettingsShadowResources.reset(); - } - @Test public void handlePreferenceTreeClick_nonMatchingKey_shouldDoNothing() { final SwitchPreference pref = new SwitchPreference(mContext); @@ -102,72 +94,77 @@ public class WifiWakeupPreferenceControllerTest { @Test public void updateState_preferenceSetCheckedWhenWakeupSettingEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1); mController.updateState(preference); - verify(preference).setChecked(true); - verify(preference).setSummary(R.string.wifi_wakeup_summary); + assertThat(preference.isChecked()).isTrue(); + assertThat(preference.getSummary()) + .isEqualTo(mContext.getString(R.string.wifi_wakeup_summary)); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(R.string.wifi_wakeup_summary); + assertThat(preference.isChecked()).isFalse(); + assertThat(preference.getSummary()) + .isEqualTo(mContext.getString(R.string.wifi_wakeup_summary)); } @Test public void updateState_preferenceSetUncheckedWhenWifiScanningDisabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); mController.updateState(preference); - verify(preference).setChecked(false); + assertThat(preference.isChecked()).isFalse(); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingEnabledNoLocation() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } @Test public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabledLocationEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } @Test public void updateState_preferenceSetUncheckedWhenWifiScanningDisabledLocationEnabled() { - final SwitchPreference preference = mock(SwitchPreference.class); + final SwitchPreference preference = new SwitchPreference(mContext); Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1); Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); - verify(preference).setChecked(false); - verify(preference).setSummary(mController.getNoLocationSummary()); + assertThat(preference.isChecked()).isFalse(); + assertThat(TextUtils.equals(preference.getSummary(), mController.getNoLocationSummary())) + .isTrue(); } } diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index f393804ec142acaf9e3296d71843ed8c86161eb6..ea306d0c055ca14df602cdc9d5514244311740ba 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.net.wifi.WifiManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowNfcAdapter; import org.junit.After; @@ -34,11 +32,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = {ShadowNfcAdapter.class, SettingsShadowResourcesImpl.class}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = ShadowNfcAdapter.class) public class WriteWifiConfigToNfcDialogTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index d60f8cfa0a19248f044b62f601f4ada33c47fa4f..b194d73e0cf160d4c60a8ed4af92db5a00039ff9 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -18,17 +18,15 @@ package com.android.settings.wifi.calling; import static com.google.common.truth.Truth.assertThat; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - import org.junit.Test; import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingSettingsForSubTest { @Test public void getHelpResource_shouldReturn0() { - assertThat(new WifiCallingSettingsForSub().getHelpResource()) - .isEqualTo(0); + assertThat(new WifiCallingSettingsForSub().getHelpResource()).isEqualTo(0); } } diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 11dd56e6f4892ba53011df1cd14f489545716e9a..f9109ce3e24301455a179adc651e66a890dc6ce7 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -55,7 +55,6 @@ import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; @@ -63,12 +62,13 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiCallingSliceHelperTest { private Context mContext; @@ -387,7 +387,6 @@ public class WifiCallingSliceHelperTest { rowContent = (RowContent) rowItems.get(3); assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText( com.android.internal.R.string.wfc_mode_cellular_preferred_summary)); - } private PendingIntent getBroadcastIntent(String action) { @@ -444,7 +443,7 @@ public class WifiCallingSliceHelperTest { return mSubId; } - protected void setDefaultVoiceSubId(int id) { + private void setDefaultVoiceSubId(int id) { mSubId = id; } @@ -463,11 +462,11 @@ public class WifiCallingSliceHelperTest { return defaultValue; } - public void setActivationAppIntent(Intent intent) { + private void setActivationAppIntent(Intent intent) { mActivationAppIntent = intent; } - public void setIsWifiCallingPrefEditable(boolean isWifiCallingPrefEditable) { + private void setIsWifiCallingPrefEditable(boolean isWifiCallingPrefEditable) { this.isWifiCallingPrefEditable = isWifiCallingPrefEditable; } } 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 eab9e51a094e2aa97126aca43fa0370bd0dff3db..7e1d389b38515822979b28c4967a00b4f5cdecc0 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -65,8 +65,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowBidiFormatter; import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; @@ -86,6 +84,7 @@ import org.mockito.InOrder; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @@ -95,12 +94,8 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.stream.Collectors; -@RunWith(SettingsRobolectricTestRunner.class) -@Config(shadows = { - ShadowDevicePolicyManager.class, - ShadowEntityHeaderController.class, - ShadowBidiFormatter.class -}) +@RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) public class WifiDetailPreferenceControllerTest { private static final int LEVEL = 1; 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 dd5dcc9a7b71ead474e02395ee142b76218937ca..30665e6a86593260d0c8c61a30513bd9a547139e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -26,15 +26,15 @@ import android.net.wifi.WifiConfiguration; import androidx.preference.DropDownPreference; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiMeteredPreferenceControllerTest { private static final int METERED_OVERRIDE_NONE = 0; @@ -91,6 +91,6 @@ public class WifiMeteredPreferenceControllerTest { mPreferenceController = spy(new WifiMeteredPreferenceController(mContext, null)); mPreferenceController.getMeteredOverride(); - mPreferenceController.onPreferenceChange(mDropDownPreference, new Integer(1)); + mPreferenceController.onPreferenceChange(mDropDownPreference, 1); } } diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java index a4bcfff9b88949979589c2be681ad8575ebe012b..8bbb2be7c6095682197763f96d9ccfb3e2abea7a 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java @@ -27,15 +27,15 @@ import android.net.wifi.WifiConfiguration; import androidx.preference.DropDownPreference; 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.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiPrivacyPreferenceControllerTest { private static final int PRIVACY_RANDOMIZED = 0; @@ -84,6 +84,6 @@ public class WifiPrivacyPreferenceControllerTest { mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext)); mPreferenceController.getRandomizationValue(); - mPreferenceController.onPreferenceChange(mDropDownPreference, new String("1")); + mPreferenceController.onPreferenceChange(mDropDownPreference, "1"); } } 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 8921311b7609e9d61b61cb38fb332e5f51857763..c2d99a65d89b380e109568737dd53c66a3baa16b 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -28,16 +28,15 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class P2pCategoryPreferenceControllerTest { @Mock 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 849c35acc8862eae991a186e5b3d8f1bf38288d8..0635c7131373fa323562b5e21174592e1934a7a4 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; @@ -26,16 +26,15 @@ import android.net.wifi.p2p.WifiP2pDevice; import androidx.preference.Preference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) 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 75c5ffc26911cf62258abcf1c2b9546d1b64f36b..096880359e2b180650042777c1b009245383afca 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -20,8 +20,8 @@ import static androidx.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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +36,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -45,8 +44,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiP2PPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java index 2595bb65218dc165f907bc418929dbf767286c32..e32ac6b5a8becaa96c78414fb53dbdeb87042f77 100644 --- a/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java +++ b/tests/robotests/src/com/android/settings/wifi/qrcode/QrCameraTest.java @@ -22,13 +22,11 @@ import static org.mockito.Mockito.mock; import android.content.Context; import android.graphics.Bitmap; -import android.graphics.Color; import android.graphics.Rect; import android.util.Size; import android.view.SurfaceHolder; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.google.zxing.BinaryBitmap; import com.google.zxing.LuminanceSource; @@ -43,10 +41,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class QrCameraTest { @Mock diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java index 6d609b869ea6b7e4645654861bd24cb26e3d3db6..7f7ecc5c6948896df924ca244c28d1306f943207 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccessPoint; import com.android.settings.testutils.shadow.ShadowThreadUtils; import com.android.settings.testutils.shadow.ShadowWifiManager; @@ -44,10 +43,11 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowThreadUtils.class, ShadowWifiManager.class}) public class SavedAccessPointsPreferenceControllerTest { @@ -86,7 +86,6 @@ public class SavedAccessPointsPreferenceControllerTest { verify(mController).refreshSavedAccessPoints(); } - @Test public void postRefresh_shouldRefreshApList() { doNothing().when(mController).refreshSavedAccessPoints(); diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java index 97ad7d9b2f33660802f5be159a8d394c6cd98873..f76184cc51c0571410adc5327edac7abb9f88926 100644 --- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java @@ -28,7 +28,6 @@ import android.net.wifi.WifiManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.wifi.WifiConfigController; import com.android.settings.wifi.WifiDialog; import com.android.settingslib.core.AbstractPreferenceController; @@ -39,9 +38,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class SavedAccessPointsWifiSettingsTest { @Mock @@ -90,8 +90,7 @@ public class SavedAccessPointsWifiSettingsTest { mSettings.onForget(mWifiDialog); - verify(mWifiManager) - .forget(mWifiConfiguration.networkId, mSavedApController); + verify(mWifiManager).forget(mWifiConfiguration.networkId, mSavedApController); } @Test 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 fb7bef183ad168fc352c4a98f7fe04677c604733..f6fd660fa8bc856c559879bb24ae7b0c5c244783 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -17,9 +17,9 @@ package com.android.settings.wifi.tether; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -29,13 +29,12 @@ import android.content.Context; import android.content.SharedPreferences; import android.net.wifi.WifiManager; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication.Wrapper; @@ -43,7 +42,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class TetherServiceTest { @Mock 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 6faff11d011013e0a9c79997fa2837a103d6a5e0..6bc2869cc1503c8985148e5c1618b18b34cf28c3 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -33,16 +33,16 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { private static final String ALL_BANDS = "5.0 GHz Band preferred"; 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 519aa54e4a5b4756fbbeb8c8eb8de7c8ae8d2f12..f027147eb23c429bcebff2a8e8c4f477a29bfd2e 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -23,15 +23,14 @@ import android.provider.Settings; import androidx.preference.SwitchPreference; -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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherAutoOffPreferenceControllerTest { private static final String KEY_PREF = "wifi_tether_auto_off"; 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 1b063d0ff86d8a2264961dbac3fefb10d112fe76..62fb2773b4d95b95c6e62e1922ca9a84888e944c 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; import org.junit.Before; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherPasswordPreferenceControllerTest { private static final String VALID_PASS = "12345678"; 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 c81c490ed127bf9842eb5af34fabbe52ac45a78b..d8cd878ae781e1c51144e75d7157e8f32869808e 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -36,26 +36,24 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.MasterSwitchPreference; 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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = { WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class, - WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class, WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class }) public class WifiTetherPreferenceControllerTest { @@ -99,11 +97,6 @@ public class WifiTetherPreferenceControllerTest { mController.displayPreference(mScreen); } - @After - public void tearDown() { - ShadowWifiTetherSwitchBarController.reset(); - } - @Test public void isAvailable_noTetherRegex_shouldReturnFalse() { when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{}); @@ -181,7 +174,7 @@ public class WifiTetherPreferenceControllerTest { public static final class ShadowWifiTetherSettings { @Implementation - public static boolean isTetherSettingPageEnabled() { + protected static boolean isTetherSettingPageEnabled() { return true; } } @@ -189,35 +182,13 @@ public class WifiTetherPreferenceControllerTest { @Implements(WifiTetherSoftApManager.class) public static final class ShadowWifiTetherSoftApManager { @Implementation - public void registerSoftApCallback() { + protected void registerSoftApCallback() { // do nothing } @Implementation - public void unRegisterSoftApCallback() { + protected void unRegisterSoftApCallback() { // do nothing } } - - @Implements(WifiTetherSwitchBarController.class) - public static final class ShadowWifiTetherSwitchBarController { - - private static boolean onStartCalled; - private static boolean onStopCalled; - - public static void reset() { - onStartCalled = false; - onStopCalled = false; - } - - @Implementation - public void onStart() { - onStartCalled = true; - } - - @Implementation - public void onStop() { - onStopCalled = true; - } - } } 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 a9d4a43c4fe25eee648048e861609cbae518b7e7..cb58778b2ec4069b73ebe6ace112cef9fe1b93bf 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -18,7 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +30,6 @@ import android.net.wifi.WifiManager; import androidx.preference.PreferenceScreen; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.ValidatedEditTextPreference; import org.junit.Before; @@ -39,9 +38,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSSIDPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index bbf15add06a36ee1f80eb616fe4c16064845da49..8a7c34a3d0b155cf5c6d8e966d03fe8d44ddee33 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -14,16 +14,15 @@ import android.net.wifi.WifiManager; import androidx.preference.ListPreference; import androidx.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.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSecurityPreferenceControllerTest { private static final String WPA2_PSK = String.valueOf(WifiConfiguration.KeyMgmt.WPA2_PSK); 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 ef1a3b6885412dde331e6b0c1728e10d4d0af4b0..40d651e0ddc4bb62593905f71999b43635f48fac 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.nullable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -36,7 +36,6 @@ import android.os.UserManager; import android.widget.TextView; import com.android.settings.testutils.FakeFeatureFactory; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowWifiManager; import org.junit.Before; @@ -44,6 +43,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -54,7 +54,7 @@ import java.util.List; import androidx.fragment.app.FragmentActivity; import androidx.preference.PreferenceScreen; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowWifiManager.class}) public class WifiTetherSettingsTest { private static final String[] WIFI_REGEXS = {"wifi_regexs"}; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index d22776f647f190a97d4ef684d81d3bfea68d4d09..1a5a2288bb4c978a5228e6f5f31bccc7dea733b5 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -34,7 +34,6 @@ import android.net.NetworkPolicyManager; import android.net.wifi.WifiManager; import android.provider.Settings; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBarController; @@ -43,9 +42,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(SettingsRobolectricTestRunner.class) +@RunWith(RobolectricTestRunner.class) public class WifiTetherSwitchBarControllerTest { @Mock private WifiManager mWifiManager; @@ -79,8 +79,7 @@ public class WifiTetherSwitchBarControllerTest { Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); - final WifiTetherSwitchBarController controller = new WifiTetherSwitchBarController( - mContext, new SwitchBarController(mSwitchBar)); + new WifiTetherSwitchBarController(mContext, new SwitchBarController(mSwitchBar)); assertThat(mSwitchBar.isEnabled()).isFalse(); }