From 5c50dc11b857dfdc265a4e0aa80fd7d17a62e7f6 Mon Sep 17 00:00:00 2001 From: James Lemieux Date: Mon, 12 Feb 2018 01:30:32 -0800 Subject: [PATCH] Use external/robolectric-shadows/run_robotests.mk This allows SettingsLib to test against the latest framework changes. Also replaced TestConfig with traditional robolectric.properties. Also reworked the test runner to avoid using deprecated API. Bug: 73173204 Test: make -j56 RunSettingsLibRoboTests Change-Id: Iebe130d6542ed7096147e3fff61f9cfd76aad948 --- packages/SettingsLib/tests/robotests/Android.mk | 36 ++++++------- .../tests/robotests/config/robolectric.properties | 2 + .../settingslib/CustomEditTextPreferenceTest.java | 2 - .../android/settingslib/DeviceInfoUtilsTest.java | 2 - .../src/com/android/settingslib/HelpUtilsTest.java | 17 +++--- .../settingslib/RestrictedLockUtilsTest.java | 5 -- .../RestrictedPreferenceHelperTest.java | 15 +++--- .../SettingsLibRobolectricTestRunner.java | 63 +++++++++++++--------- .../src/com/android/settingslib/TestConfig.java | 25 --------- .../com/android/settingslib/TetherUtilTest.java | 7 +-- .../settingslib/TwoTargetPreferenceTest.java | 2 - .../src/com/android/settingslib/UtilsTest.java | 12 ++--- .../applications/ServiceListingTest.java | 13 ----- .../settingslib/bluetooth/A2dpProfileTest.java | 21 +++----- .../bluetooth/CachedBluetoothDeviceTest.java | 7 +-- .../android/settingslib/bluetooth/UtilsTest.java | 5 -- .../core/AbstractPreferenceControllerTest.java | 4 -- .../MetricsFeatureProviderTest.java | 3 -- .../SharedPreferenceLoggerTest.java | 4 -- .../instrumentation/VisibilityLoggerMixinTest.java | 6 +-- .../settingslib/core/lifecycle/LifecycleTest.java | 3 -- .../DevelopmentSettingsEnablerTest.java | 5 +- .../EnableAdbPreferenceControllerTest.java | 3 -- .../LogdSizePreferenceControllerTest.java | 10 ---- .../LogpersistPreferenceControllerTest.java | 4 -- .../development/SystemPropPokerTest.java | 4 -- .../development/SystemPropertiesTestImpl.java | 61 --------------------- .../BluetoothAddressPreferenceControllerTest.java | 2 - .../ConnectivityPreferenceControllerTest.java | 4 -- .../ImsStatusPreferenceControllerTest.java | 3 -- .../IpAddressPreferenceControllerTest.java | 3 -- .../SerialNumberPreferenceControllerTest.java | 3 -- .../SimStatusImeiInfoPreferenceControllerTest.java | 5 +- .../deviceinfo/UptimePreferenceControllerTest.java | 4 -- .../WifiMacAddressPreferenceControllerTest.java | 4 -- .../settingslib/drawer/CategoryKeyTest.java | 9 +--- .../settingslib/drawer/CategoryManagerTest.java | 7 +-- .../android/settingslib/drawer/TileUtilsTest.java | 6 +-- .../fuelgauge/PowerWhitelistBackendTest.java | 4 -- .../graph/BatteryMeterDrawableBaseTest.java | 5 -- .../graph/BluetoothDeviceLayerDrawableTest.java | 6 --- .../license/LicenseHtmlGeneratorFromXmlTest.java | 3 -- .../settingslib/license/LicenseHtmlLoaderTest.java | 4 -- .../location/RecentLocationAppsTest.java | 18 +++---- .../notification/EnableZenModeDialogTest.java | 5 -- .../suggestions/SuggestionControllerMixinTest.java | 8 +-- .../suggestions/SuggestionParserTest.java | 21 +------- .../shadow/SettingsLibShadowResources.java | 49 ----------------- .../shadow/ShadowPackageManagerWrapper.java | 54 ------------------- .../testutils/shadow/ShadowUserManager.java | 2 +- .../android/settingslib/utils/PowerUtilTest.java | 9 ++-- .../android/settingslib/utils/StringUtilTest.java | 5 +- .../android/settingslib/utils/ThreadUtilsTest.java | 4 -- .../settingslib/widget/AnimatedImageViewTest.java | 8 ++- .../widget/FooterPreferenceMixinTest.java | 3 -- .../settingslib/widget/FooterPreferenceTest.java | 7 +-- .../wifi/AccessPointPreferenceTest.java | 3 -- .../wifi/TimestampedScoredNetworkTest.java | 8 ++- .../android/settingslib/wifi/WifiUtilsTest.java | 4 -- 59 files changed, 120 insertions(+), 501 deletions(-) create mode 100644 packages/SettingsLib/tests/robotests/config/robolectric.properties delete mode 100644 packages/SettingsLib/tests/robotests/src/com/android/settingslib/TestConfig.java delete mode 100644 packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropertiesTestImpl.java delete mode 100644 packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/SettingsLibShadowResources.java delete mode 100644 packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowPackageManagerWrapper.java diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk index 7cf716305887..f5c42b68e32b 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk @@ -12,12 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. - ############################################################ # SettingsLib Shell app just for Robolectric test target. # ############################################################ LOCAL_PATH := $(call my-dir) - include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := SettingsLibShell @@ -25,8 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRIVILEGED_MODULE := true -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true @@ -35,43 +32,44 @@ include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_PACKAGE) ############################################# -# SettingsLib Robolectric test target. # +# SettingsLib Robolectric test target. # ############################################# include $(CLEAR_VARS) +LOCAL_MODULE := SettingsLibRoboTests + LOCAL_SRC_FILES := $(call all-java-files-under, src) -# Include the testing libraries (JUnit4 + Robolectric libs). -LOCAL_STATIC_JAVA_LIBRARIES := \ - mockito-robolectric-prebuilt \ - platform-robolectric-android-all-stubs \ - truth-prebuilt +LOCAL_JAVA_RESOURCE_DIRS := config LOCAL_JAVA_LIBRARIES := \ - junit \ - platform-robolectric-3.6.1-prebuilt + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt LOCAL_INSTRUMENTATION_FOR := SettingsLibShell -LOCAL_MODULE := SettingsLibRoboTests LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_JAVA_LIBRARY) ############################################################# -# SettingsLib runner target to run the previous target. # +# SettingsLib runner target to run the previous target. # ############################################################# include $(CLEAR_VARS) LOCAL_MODULE := RunSettingsLibRoboTests -LOCAL_SDK_VERSION := current - -LOCAL_STATIC_JAVA_LIBRARIES := \ - SettingsLibRoboTests +LOCAL_JAVA_LIBRARIES := \ + SettingsLibRoboTests \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt LOCAL_TEST_PACKAGE := SettingsLibShell LOCAL_ROBOTEST_TIMEOUT := 36000 -include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk +include external/robolectric-shadows/run_robotests.mk \ No newline at end of file diff --git a/packages/SettingsLib/tests/robotests/config/robolectric.properties b/packages/SettingsLib/tests/robotests/config/robolectric.properties new file mode 100644 index 000000000000..34a2a1a28ada --- /dev/null +++ b/packages/SettingsLib/tests/robotests/config/robolectric.properties @@ -0,0 +1,2 @@ +manifest=frameworks/base/packages/SettingsLib/tests/robotests/AndroidManifest.xml +sdk=NEWEST_SDK \ No newline at end of file diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java index 7e374931b767..9d7f59a78fa5 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java @@ -31,11 +31,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class CustomEditTextPreferenceTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java index 82604f767c47..19a916cf85da 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java @@ -25,10 +25,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class DeviceInfoUtilsTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java index fdc42bf6724a..e153c3ed1edf 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java @@ -16,6 +16,13 @@ package com.android.settingslib; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -27,6 +34,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.provider.Settings; import android.view.MenuItem; + import com.android.internal.R; import org.junit.Before; @@ -37,20 +45,11 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; - -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; /** * Tests for {@link HelpUtils}. */ @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class HelpUtilsTest { private static final String TEST_HELP_URL = "intent:#Intent;action=com.android.test;end"; private static final String PACKAGE_NAME_KEY = "package-name-key"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java index 64de63520f87..5f6086897d76 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java @@ -20,11 +20,8 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_NO import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; - import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -43,12 +40,10 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import java.util.Arrays; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class RestrictedLockUtilsTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java index 79d99f75b5bf..a8821ba60785 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java @@ -17,6 +17,12 @@ package com.android.settingslib; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceViewHolder; @@ -28,19 +34,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; - -import static org.mockito.Mockito.RETURNS_DEEP_STUBS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class RestrictedPreferenceHelperTest { - @Mock private Context mContext; @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java index df850bee13df..8778ae949e20 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java @@ -15,6 +15,8 @@ */ package com.android.settingslib; +import android.annotation.NonNull; + import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -22,6 +24,8 @@ 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; public class SettingsLibRobolectricTestRunner extends RobolectricTestRunner { @@ -30,33 +34,40 @@ public class SettingsLibRobolectricTestRunner extends RobolectricTestRunner { super(testClass); } + /** + * We are going to create our own custom manifest so we can add multiple resource paths to it. + */ @Override protected AndroidManifest getAppManifest(Config config) { - // Using the manifest file's relative path, we can figure out the application directory. - final String appRoot = "frameworks/base/packages/SettingsLib"; - final String manifestPath = appRoot + "/AndroidManifest.xml"; - final String resDir = appRoot + "/tests/robotests/res"; - final String assetsDir = appRoot + config.assetDir(); - - return new AndroidManifest(Fs.fileFromPath(manifestPath), Fs.fileFromPath(resDir), - Fs.fileFromPath(assetsDir), "com.android.settingslib") { - @Override - public List getIncludedResourcePaths() { - List paths = super.getIncludedResourcePaths(); - paths.add(new ResourcePath( - null, - Fs.fileFromPath("./frameworks/base/packages/SettingsLib/res"), - null)); - paths.add(new ResourcePath( - null, - Fs.fileFromPath("./frameworks/base/core/res/res"), - null)); - paths.add(new ResourcePath( - null, - Fs.fileFromPath("./frameworks/support/v7/appcompat/res"), - null)); - return paths; - } - }; + try { + // Using the manifest file's relative path, we can figure out the application directory. + final URL appRoot = + new URL("file:frameworks/base/packages/SettingsLib/tests/robotests"); + final URL manifestPath = new URL(appRoot, "AndroidManifest.xml"); + final URL resDir = new URL(appRoot, "res"); + final URL assetsDir = new URL(appRoot, "assets"); + + return new AndroidManifest(Fs.fromURL(manifestPath), Fs.fromURL(resDir), + Fs.fromURL(assetsDir), "com.android.settingslib") { + @Override + public List getIncludedResourcePaths() { + final List paths = super.getIncludedResourcePaths(); + paths.add(resourcePath("file:frameworks/base/packages/SettingsLib/res")); + paths.add(resourcePath("file:frameworks/base/core/res/res")); + paths.add(resourcePath("file:frameworks/support/v7/appcompat/res")); + return paths; + } + }; + } catch (MalformedURLException e) { + throw new RuntimeException("SettingsLibRobolectricTestRunner failure", e); + } + } + + private static ResourcePath resourcePath(@NonNull String spec) { + try { + return new ResourcePath(null, Fs.fromURL(new URL(spec)), null); + } catch (MalformedURLException e) { + throw new RuntimeException("SettingsLibRobolectricTestRunner failure", e); + } } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TestConfig.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TestConfig.java deleted file mode 100644 index 1f9070c266a0..000000000000 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TestConfig.java +++ /dev/null @@ -1,25 +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.settingslib; - -import android.os.Build; - -public class TestConfig { - public static final int SDK_VERSION = Build.VERSION_CODES.O; - public static final String MANIFEST_PATH = - "frameworks/base/packages/SettingsLib/tests/robotests/AndroidManifest.xml"; -} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java index 8bd31d4789db..0109f48e0c5d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java @@ -16,6 +16,8 @@ package com.android.settingslib; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.when; import android.content.Context; @@ -24,13 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; - -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class TetherUtilTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java index b5ee5adc8135..c5e93f009bf3 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java @@ -31,10 +31,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class TwoTargetPreferenceTest { private PreferenceViewHolder mViewHolder; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index 5459fb7a47cb..12d3106cfe61 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -34,9 +34,9 @@ import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.Secure; import android.text.TextUtils; + import com.android.settingslib.wrapper.LocationManagerWrapper; -import java.util.HashMap; -import java.util.Map; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,11 +50,11 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowSettings; +import java.util.HashMap; +import java.util.Map; + @RunWith(SettingsLibRobolectricTestRunner.class) -@Config( - manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, - shadows = { +@Config(shadows = { UtilsTest.ShadowSecure.class, UtilsTest.ShadowLocationManagerWrapper.class}) public class UtilsTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java index fa31a7d22ae3..060b716bb435 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.applications; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -27,24 +26,17 @@ import android.content.ComponentName; import android.provider.Settings; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import com.android.settingslib.testutils.shadow.ShadowPackageManagerWrapper; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = {ShadowPackageManagerWrapper.class}) public class ServiceListingTest { private static final String TEST_SETTING = "testSetting"; private static final String TEST_INTENT = "com.example.intent"; - private static final String TEST_PERMISSION = "testPermission"; private ServiceListing mServiceListing; @@ -59,11 +51,6 @@ public class ServiceListingTest { .build(); } - @After - public void tearDown() { - ShadowPackageManagerWrapper.reset(); - } - @Test public void testCallback() { ServiceListing.Callback callback = mock(ServiceListing.Callback.class); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java index 590bc90ca818..334ea16d608e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java @@ -15,6 +15,13 @@ */ package com.android.settingslib.bluetooth; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; @@ -24,30 +31,16 @@ import android.content.Context; import android.content.res.Resources; import com.android.settingslib.R; -import com.android.settingslib.TestConfig; import com.android.settingslib.wrapper.BluetoothA2dpWrapper; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class A2dpProfileTest { @Mock Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java index 1481161bcb6c..92c68e63fa0d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java @@ -16,7 +16,6 @@ package com.android.settingslib.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.Mockito.doAnswer; @@ -30,9 +29,6 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import com.android.settingslib.R; -import com.android.settingslib.TestConfig; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,8 +39,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, resourceDir = - "../../res") +@Config(resourceDir = "../../res") public class CachedBluetoothDeviceTest { private final static String DEVICE_NAME = "TestName"; private final static String DEVICE_ALIAS = "TestAlias"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/UtilsTest.java index 5eb543ba3bae..baba267cdf55 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/UtilsTest.java @@ -22,18 +22,13 @@ import android.graphics.drawable.Drawable; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.graph.BluetoothDeviceLayerDrawable; -import com.android.settingslib.testutils.shadow.SettingsLibShadowResources; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SettingsLibShadowResources.class) public class UtilsTest { @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java index 26970e1c7aff..8767923b2b39 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java @@ -22,8 +22,6 @@ import android.content.Context; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settingslib.TestConfig; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,10 +29,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AbstractPreferenceControllerTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java index 8bea51d1696d..5c19e61d44dc 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java @@ -28,7 +28,6 @@ import android.content.Intent; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Before; @@ -39,14 +38,12 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class MetricsFeatureProviderTest { private static int CATEGORY = 10; private static boolean SUBTYPE_BOOLEAN = true; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java index d558a645aeb7..ebafc594c122 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java @@ -30,9 +30,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Pair; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; - import com.google.common.truth.Platform; import org.junit.Before; @@ -42,10 +40,8 @@ import org.mockito.Answers; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SharedPreferenceLoggerTest { private static final String TEST_TAG = "tag"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java index 1ab6afe5b99d..8b31450f8a3f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java @@ -16,7 +16,6 @@ package com.android.settingslib.core.instrumentation; import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -30,12 +29,11 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.content.Intent; - import android.os.Bundle; import android.support.v4.app.FragmentActivity; + import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -44,11 +42,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.android.controller.ActivityController; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class VisibilityLoggerMixinTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java index ae24c079e37b..2b2bf5b6cc8b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java @@ -25,7 +25,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.events.OnAttach; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; import com.android.settingslib.core.lifecycle.events.OnDestroy; @@ -42,10 +41,8 @@ import org.junit.runner.RunWith; import org.robolectric.Robolectric; import org.robolectric.android.controller.ActivityController; import org.robolectric.android.controller.FragmentController; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LifecycleTest { private LifecycleOwner mLifecycleOwner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java index 708353ebb7a0..a15f5fce558e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java @@ -22,7 +22,6 @@ import android.content.Context; import android.provider.Settings; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.testutils.shadow.ShadowUserManager; import org.junit.After; @@ -33,9 +32,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = { - ShadowUserManager.class -}) +@Config(shadows = ShadowUserManager.class) public class DevelopmentSettingsEnablerTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java index aac736a94832..475e7d8c2209 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java @@ -31,18 +31,15 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class EnableAdbPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) private PreferenceScreen mScreen; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java index 26d357018a75..72c8d1ad3642 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java @@ -45,20 +45,15 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SystemPropertiesTestImpl.class) public class LogdSizePreferenceControllerTest { @Mock @@ -95,11 +90,6 @@ public class LogdSizePreferenceControllerTest { mController.displayPreference(mPreferenceScreen); } - @After - public void tearDown() { - SystemPropertiesTestImpl.clear(); - } - @Test public void testUpdateLogdSizeValues_lowRamEntries() { SystemProperties.set(LOW_RAM_CONFIG_PROPERTY_KEY, "true"); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java index 050877d3ebfe..4b9bfc3f37ca 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java @@ -28,7 +28,6 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,11 +36,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SystemPropertiesTestImpl.class) public class LogpersistPreferenceControllerTest { private LifecycleOwner mLifecycleOwner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropPokerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropPokerTest.java index fa7961be7979..40db478f2dc7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropPokerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropPokerTest.java @@ -20,7 +20,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -29,7 +28,6 @@ import android.os.IBinder; import android.os.Parcel; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -37,10 +35,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SystemPropPokerTest { @Spy diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropertiesTestImpl.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropertiesTestImpl.java deleted file mode 100644 index 6977e09180c5..000000000000 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/SystemPropertiesTestImpl.java +++ /dev/null @@ -1,61 +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.settingslib.development; - -import android.text.TextUtils; -import android.util.ArrayMap; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowSystemProperties; - -import java.util.Map; - -@Implements(className = "android.os.SystemProperties") -public class SystemPropertiesTestImpl extends ShadowSystemProperties { - - private static Map sProperties = new ArrayMap<>(); - - @Implementation - public static String get(String key) { - String value = sProperties.get(key); - if (!TextUtils.isEmpty(value)) { - return value; - } else { - return ShadowSystemProperties.get(key); - } - } - - @Implementation - public static String get(String key, String def) { - String value = sProperties.get(key); - if (!TextUtils.isEmpty(value)) { - return value; - } else { - return ShadowSystemProperties.get(key, def); - } - } - - @Implementation - public static void set(String key, String val) { - sProperties.put(key, val); - } - - public static synchronized void clear() { - sProperties.clear(); - } -} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java index 1de7a7a9fb39..0385f4bd29af 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -39,7 +38,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class BluetoothAddressPreferenceControllerTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java index 362dbd944525..7c127e5cd5b7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; - import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doReturn; @@ -31,7 +30,6 @@ import android.content.IntentFilter; import android.os.Handler; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -40,10 +38,8 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class ConnectivityPreferenceControllerTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java index 112ee64a6468..d600c2093c77 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -30,7 +29,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -43,7 +41,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class ImsStatusPreferenceControllerTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java index d0ecae37c849..99e582cae60a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java @@ -27,7 +27,6 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -35,13 +34,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.List; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class IpAddressPreferenceControllerTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java index 34bbf4f14d07..a4fa7aa29bef 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java @@ -24,7 +24,6 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -32,10 +31,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SerialNumberPreferenceControllerTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java index 28409fae45e6..eaae40553d6e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.shadow.api.Shadow.extract; import android.net.ConnectivityManager; @@ -25,7 +24,6 @@ import android.os.UserManager; import android.util.SparseBooleanArray; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -36,8 +34,7 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = {SimStatusImeiInfoPreferenceControllerTest.ShadowUserManager.class, +@Config(shadows = {SimStatusImeiInfoPreferenceControllerTest.ShadowUserManager.class, SimStatusImeiInfoPreferenceControllerTest.ShadowConnectivityManager.class}) public class SimStatusImeiInfoPreferenceControllerTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java index f68533ba4081..39e05faddc1a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java @@ -28,7 +28,6 @@ import android.support.v7.preference.PreferenceScreen; import android.text.format.DateUtils; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -36,11 +35,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class UptimePreferenceControllerTest { @Mock private Context mContext; @@ -98,5 +95,4 @@ public class UptimePreferenceControllerTest { super(context, lifecycle); } } - } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java index 265a60b3325a..d546f11d9998 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,7 +31,6 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -40,14 +38,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.List; @SuppressLint("HardwareIds") @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class WifiMacAddressPreferenceControllerTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java index 6be44cc07194..b90f37ad5256 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryKeyTest.java @@ -16,21 +16,17 @@ package com.android.settingslib.drawer; -import android.util.ArraySet; +import static com.google.common.truth.Truth.assertThat; -import com.android.settingslib.TestConfig; +import android.util.ArraySet; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import java.util.Set; -import static com.google.common.truth.Truth.assertThat; - @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class CategoryKeyTest { @Test @@ -64,5 +60,4 @@ public class CategoryKeyTest { assertThat(allKeys.size()).isEqualTo(15); } - } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java index f099c90fc760..4efcb7ed3cde 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java @@ -16,27 +16,24 @@ package com.android.settingslib.drawer; +import static com.google.common.truth.Truth.assertThat; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.util.Pair; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import java.util.HashMap; import java.util.Map; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class CategoryManagerTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java index a395a4ab1477..fc1b22385b49 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.drawer; 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; @@ -54,7 +53,6 @@ import android.util.Pair; import android.widget.RemoteViews; import com.android.settingslib.R; -import com.android.settingslib.TestConfig; import com.android.settingslib.suggestions.SuggestionParser; import org.junit.Before; @@ -74,9 +72,7 @@ import java.util.List; import java.util.Map; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, - shadows = {TileUtilsTest.TileUtilsShadowRemoteViews.class}) +@Config(shadows = TileUtilsTest.TileUtilsShadowRemoteViews.class) public class TileUtilsTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java index fc0019d09c41..c6a1428fa34e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; @@ -27,17 +26,14 @@ import static org.mockito.Mockito.verify; import android.os.IDeviceIdleController; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class PowerWhitelistBackendTest { private static final String PACKAGE_ONE = "com.example.packageone"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java index e0222329f231..49dde0e6fcfa 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java @@ -26,8 +26,6 @@ import android.graphics.Canvas; import android.graphics.Paint; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import com.android.settingslib.testutils.shadow.SettingsLibShadowResources; import org.junit.Before; import org.junit.Test; @@ -35,12 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SettingsLibShadowResources.class) public class BatteryMeterDrawableBaseTest { private static final int CRITICAL_LEVEL = 5; private static final int PADDING = 5; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java index 94f80d3d0ac7..37d4d1d845f5 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java @@ -19,23 +19,17 @@ package com.android.settingslib.graph; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.VectorDrawable; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import com.android.settingslib.testutils.shadow.SettingsLibShadowResources; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SettingsLibShadowResources.class) public class BluetoothDeviceLayerDrawableTest { private static final int RES_ID = R.drawable.ic_bt_cellphone; private static final int BATTERY_LEVEL = 15; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java index c7e9262ec4d8..96b2a1433f53 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java @@ -18,12 +18,10 @@ package com.android.settingslib.license; import static com.google.common.truth.Truth.assertThat; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.xmlpull.v1.XmlPullParserException; import java.io.ByteArrayInputStream; @@ -35,7 +33,6 @@ import java.util.HashMap; import java.util.Map; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LicenseHtmlGeneratorFromXmlTest { private static final String VALILD_XML_STRING = "\n" diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java index 1a6f30c49e46..5095f508997e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java @@ -17,7 +17,6 @@ package com.android.settingslib.license; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -26,7 +25,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Before; @@ -34,13 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import java.io.File; import java.util.ArrayList; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LicenseHtmlLoaderTest { @Mock private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java index 226166b3e632..5e0fcefc5209 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java @@ -1,8 +1,8 @@ package com.android.settingslib.location; +import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.when; -import static com.google.common.truth.Truth.assertThat; import android.app.AppOpsManager; import android.app.AppOpsManager.OpEntry; @@ -15,23 +15,21 @@ import android.content.res.Resources; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; + import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config( - manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION) public class RecentLocationAppsTest { private static final int TEST_UID = 1234; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java index 777cd98e2ef7..9b5da4ae1f95 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java @@ -18,21 +18,18 @@ package com.android.settingslib.notification; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.app.Activity; import android.app.Fragment; import android.content.Context; import android.net.Uri; import android.service.notification.Condition; import android.view.LayoutInflater; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Before; @@ -41,10 +38,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class EnableZenModeDialogTest { private EnableZenModeDialog mController; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java index ed1c405f8a81..cfa16b8a952a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java @@ -18,9 +18,7 @@ package com.android.settingslib.suggestions; import static android.arch.lifecycle.Lifecycle.Event.ON_START; import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,7 +28,6 @@ import android.arch.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; -import com.android.settingslib.TestConfig; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -44,10 +41,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = { - ShadowSuggestionController.class - }) +@Config(shadows = ShadowSuggestionController.class) public class SuggestionControllerMixinTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java index db599a776d23..d05bcfd31685 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java @@ -17,11 +17,9 @@ package com.android.settingslib.suggestions; import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.shadow.api.Shadow.extract; -import android.app.ApplicationPackageManager; import android.content.ComponentName; import android.content.Intent; import android.content.SharedPreferences; @@ -30,28 +28,22 @@ import android.os.Bundle; import android.preference.PreferenceManager; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.TileUtilsTest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.shadows.ShadowApplicationPackageManager; +import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = SuggestionParserTest.TestPackageManager.class) public class SuggestionParserTest { - private TestPackageManager mPackageManager; + private ShadowPackageManager mPackageManager; private SuggestionParser mSuggestionParser; private SuggestionCategory mMultipleCategory; private SuggestionCategory mExclusiveCategory; @@ -205,13 +197,4 @@ public class SuggestionParserTest { mSuggestionParser.readSuggestions( mMultipleCategory, mSuggestionsAfterDismiss, isSmartSuggestionEnabled); } - - @Implements(ApplicationPackageManager.class) - public static class TestPackageManager extends ShadowApplicationPackageManager { - - @Implementation - public List queryIntentActivitiesAsUser(Intent intent, int flags, int userId) { - return super.queryIntentActivities(intent, flags); - } - } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/SettingsLibShadowResources.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/SettingsLibShadowResources.java deleted file mode 100644 index b53cc371c641..000000000000 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/SettingsLibShadowResources.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.settingslib.testutils.shadow; - -import static org.robolectric.shadow.api.Shadow.directlyOn; - -import android.content.res.Resources; -import android.content.res.Resources.NotFoundException; -import android.support.annotation.ArrayRes; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; -import org.robolectric.annotation.RealObject; -import org.robolectric.shadows.ShadowResources; - -/** - * Shadow Resources to handle resource references that Robolectric shadows cannot - * handle because they are too new or private. - */ -@Implements(Resources.class) -public class SettingsLibShadowResources extends ShadowResources { - - @RealObject - public Resources realResources; - - @Implementation - public int[] getIntArray(@ArrayRes int id) throws NotFoundException { - // The Robolectric has resource mismatch for these values, so we need to stub it here - if (id == com.android.settingslib.R.array.batterymeter_bolt_points - || id == com.android.settingslib.R.array.batterymeter_plus_points) { - return new int[2]; - } - return directlyOn(realResources, Resources.class).getIntArray(id); - } -} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowPackageManagerWrapper.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowPackageManagerWrapper.java deleted file mode 100644 index 1fdca27259e2..000000000000 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowPackageManagerWrapper.java +++ /dev/null @@ -1,54 +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.settingslib.testutils.shadow; - -import android.content.Intent; -import android.content.pm.ResolveInfo; -import android.util.ArrayMap; - -import com.android.settingslib.wrapper.PackageManagerWrapper; - -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * Shadow for {@link PackageManagerWrapper} to allow stubbing hidden methods. - */ -@Implements(PackageManagerWrapper.class) -public class ShadowPackageManagerWrapper { - private static final Map> intentServices = new ArrayMap<>(); - - @Implementation - public List queryIntentServicesAsUser(Intent intent, int i, int user) { - List list = intentServices.get(intent); - return list != null ? list : Collections.emptyList(); - } - - public static void addResolveInfoForIntent(Intent intent, ResolveInfo info) { - List infoList = intentServices.computeIfAbsent(intent, k -> new ArrayList<>()); - infoList.add(info); - } - - public static void reset() { - intentServices.clear(); - } -} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java index c8b3269da09b..a3e1bc8418c7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/testutils/shadow/ShadowUserManager.java @@ -25,7 +25,7 @@ import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; -@Implements(UserManager.class) +@Implements(value = UserManager.class, inheritImplementationMethods = true) public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager { private boolean mAdminUser; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index f93210f264ff..9285148f7ae2 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -20,20 +20,19 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.spy; import android.content.Context; + import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import com.android.settingslib.utils.PowerUtil; -import java.time.Duration; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; + +import java.time.Duration; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class PowerUtilTest { public static final String TEST_BATTERY_LEVEL_10 = "10%"; public static final String FIFTEEN_MIN_FORMATTED = "15m"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java index d5e3cdb654e5..47dd02290ea1 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java @@ -23,16 +23,15 @@ import android.content.Context; import android.text.SpannableStringBuilder; import android.text.format.DateUtils; import android.text.style.TtsSpan; + import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class StringUtilTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java index 5f6a5c8bcbd1..83a9d5be0ae7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java @@ -19,16 +19,12 @@ package com.android.settingslib.utils; import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import com.android.settingslib.TestConfig; - import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class ThreadUtilsTest { @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java index 2c9c8685af50..36abd204d088 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java @@ -16,21 +16,19 @@ package com.android.settingslib.widget; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.graphics.drawable.AnimatedRotateDrawable; import android.view.View; -import com.android.settingslib.TestConfig; + 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; - -import static com.google.common.truth.Truth.assertThat; @RunWith(RobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AnimatedImageViewTest { private AnimatedImageView mAnimatedImageView; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java index 88c57b50f87e..8071c6db4cfd 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java @@ -29,7 +29,6 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -37,11 +36,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class FooterPreferenceMixinTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java index 5d01027f9505..ff11b803c053 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java @@ -16,6 +16,8 @@ package com.android.settingslib.widget; +import static com.google.common.truth.Truth.assertThat; + import android.content.Context; import android.support.v7.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; @@ -24,18 +26,13 @@ import android.widget.TextView; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class FooterPreferenceTest { private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java index 3fee16bd12ac..ee2c2ffc4b4b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java @@ -25,7 +25,6 @@ import android.content.Context; import android.graphics.drawable.ColorDrawable; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -33,10 +32,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AccessPointPreferenceTest { private Context mContext = RuntimeEnvironment.application; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/TimestampedScoredNetworkTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/TimestampedScoredNetworkTest.java index b2d9d67bd104..f0e8c66e8544 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/TimestampedScoredNetworkTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/TimestampedScoredNetworkTest.java @@ -23,16 +23,14 @@ import android.net.WifiKey; import android.os.Parcel; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; -import java.util.Date; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; + +import java.util.Date; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class TimestampedScoredNetworkTest { private TimestampedScoredNetwork impl; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java index 9310b73afdcc..ea8ecbad99bd 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java @@ -16,7 +16,6 @@ package com.android.settingslib.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; @@ -35,7 +34,6 @@ import android.text.format.DateUtils; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.TestConfig; import org.junit.Before; import org.junit.Test; @@ -43,12 +41,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.ArrayList; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class WifiUtilsTest { private static final String TEST_SSID = "\"test_ssid\""; private static final String TEST_BSSID = "00:00:00:00:00:00"; -- 2.11.0