From 35f5d2e66c304f48ee55067c7e188a2ea8b271f5 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Wed, 22 Nov 2017 10:44:36 -0800 Subject: [PATCH 01/20] Update string for battery saver "Battery saver" -> "Battery Saver" Bug: 69480774 Test: Build Change-Id: I6e1598c19ed6d85a15d6178ae010c3dd8cfe25be --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 43827e369e7..ee3b4b5b8bb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4970,7 +4970,7 @@ App optimization - Battery saver + Battery Saver Turn on automatically From 733b7c3c162d259e2cab6ee7f7bf93770d76ef5b Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 22 Nov 2017 16:17:37 -0800 Subject: [PATCH 02/20] Make sure FP error text is visible in landscape Use layout_weight in the enrolling progress bar to make sure it there is space left for the error text. Test: Manual Bug: 69686380 Change-Id: Idd3d4c4ac376e721f15b8c9871c56e0619def305 --- res/layout-land/fingerprint_enroll_enrolling.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml index fb6c78beaa6..8b902f17f8b 100644 --- a/res/layout-land/fingerprint_enroll_enrolling.xml +++ b/res/layout-land/fingerprint_enroll_enrolling.xml @@ -110,10 +110,11 @@ + android:paddingBottom="0dp"> Date: Wed, 22 Nov 2017 16:44:51 -0800 Subject: [PATCH 03/20] rename v2 controllers - Remove v2 postfix on controllers now that v1 dev options have been removed Bug: 34203528 Test: compiles and tests still pass Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591 --- ...BugReportInPowerPreferenceController.java} | 4 +- ...ava => BugReportPreferenceController.java} | 4 +- ...ameraLaserSensorPreferenceController.java} | 4 +- ...nectivityMonitorPreferenceController.java} | 4 +- .../DevelopmentSettingsDashboardFragment.java | 24 +++---- ...va => LogPersistPreferenceController.java} | 4 +- ...java => LogdSizePreferenceController.java} | 4 +- ...erifyAppsOverUsbPreferenceController.java} | 4 +- ...va => WebViewAppPreferenceController.java} | 4 +- .../WebViewAppPreferenceController.java | 2 +- ...eportInPowerPreferenceControllerTest.java} | 17 +++-- ...=> BugReportPreferenceControllerTest.java} | 6 +- ...aLaserSensorPreferenceControllerTest.java} | 53 +++++++------- ...ivityMonitorPreferenceControllerTest.java} | 72 +++++++++---------- ...elopmentSettingsDashboardFragmentTest.java | 12 ++-- ...> LogPersistPreferenceControllerTest.java} | 6 +- ... => LogdSizePreferenceControllerTest.java} | 6 +- ...yAppsOverUsbPreferenceControllerTest.java} | 12 ++-- ...> WebViewAppPreferenceControllerTest.java} | 6 +- .../WebViewAppPreferenceControllerTest.java | 2 +- 20 files changed, 123 insertions(+), 127 deletions(-) rename src/com/android/settings/development/{BugReportInPowerPreferenceControllerV2.java => BugReportInPowerPreferenceController.java} (96%) rename src/com/android/settings/development/{BugReportPreferenceControllerV2.java => BugReportPreferenceController.java} (89%) rename src/com/android/settings/development/{CameraLaserSensorPreferenceControllerV2.java => CameraLaserSensorPreferenceController.java} (96%) rename src/com/android/settings/development/{ConnectivityMonitorPreferenceControllerV2.java => ConnectivityMonitorPreferenceController.java} (96%) rename src/com/android/settings/development/{LogPersistPreferenceControllerV2.java => LogPersistPreferenceController.java} (95%) rename src/com/android/settings/development/{LogdSizePreferenceControllerV2.java => LogdSizePreferenceController.java} (91%) rename src/com/android/settings/development/{VerifyAppsOverUsbPreferenceControllerV2.java => VerifyAppsOverUsbPreferenceController.java} (98%) rename src/com/android/settings/development/{WebViewAppPreferenceControllerV2.java => WebViewAppPreferenceController.java} (96%) rename tests/robotests/src/com/android/settings/development/{BugReportInPowerPreferenceControllerV2Test.java => BugReportInPowerPreferenceControllerTest.java} (92%) rename tests/robotests/src/com/android/settings/development/{BugReportPreferenceControllerV2Test.java => BugReportPreferenceControllerTest.java} (91%) rename tests/robotests/src/com/android/settings/development/{CameraLaserSensorPreferenceControllerV2Test.java => CameraLaserSensorPreferenceControllerTest.java} (75%) rename tests/robotests/src/com/android/settings/development/{ConnectivityMonitorPreferenceControllerV2Test.java => ConnectivityMonitorPreferenceControllerTest.java} (66%) rename tests/robotests/src/com/android/settings/development/{LogPersistPreferenceControllerV2Test.java => LogPersistPreferenceControllerTest.java} (93%) rename tests/robotests/src/com/android/settings/development/{LogdSizePreferenceControllerV2Test.java => LogdSizePreferenceControllerTest.java} (94%) rename tests/robotests/src/com/android/settings/development/{VerifyAppsOverUsbPreferenceControllerV2Test.java => VerifyAppsOverUsbPreferenceControllerTest.java} (95%) rename tests/robotests/src/com/android/settings/development/{WebViewAppPreferenceControllerV2Test.java => WebViewAppPreferenceControllerTest.java} (95%) diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java similarity index 96% rename from src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java rename to src/com/android/settings/development/BugReportInPowerPreferenceController.java index 0ab826f19a3..31b618b5a4c 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -30,7 +30,7 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.wrapper.PackageManagerWrapper; -public class BugReportInPowerPreferenceControllerV2 extends +public class BugReportInPowerPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { @@ -48,7 +48,7 @@ public class BugReportInPowerPreferenceControllerV2 extends private final UserManager mUserManager; private SwitchPreference mPreference; - public BugReportInPowerPreferenceControllerV2(Context context) { + public BugReportInPowerPreferenceController(Context context) { super(context); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mPackageManager = new PackageManagerWrapper(context.getPackageManager()); diff --git a/src/com/android/settings/development/BugReportPreferenceControllerV2.java b/src/com/android/settings/development/BugReportPreferenceController.java similarity index 89% rename from src/com/android/settings/development/BugReportPreferenceControllerV2.java rename to src/com/android/settings/development/BugReportPreferenceController.java index 5876f840900..ac2ae0d9ca3 100644 --- a/src/com/android/settings/development/BugReportPreferenceControllerV2.java +++ b/src/com/android/settings/development/BugReportPreferenceController.java @@ -22,14 +22,14 @@ import android.os.UserManager; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController implements +public class BugReportPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { private static final String KEY_BUGREPORT = "bugreport"; private final UserManager mUserManager; - public BugReportPreferenceControllerV2(Context context) { + public BugReportPreferenceController(Context context) { super(context); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java similarity index 96% rename from src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java rename to src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 43943acc387..41a79831bd1 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -public class CameraLaserSensorPreferenceControllerV2 extends +public class CameraLaserSensorPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { @@ -51,7 +51,7 @@ public class CameraLaserSensorPreferenceControllerV2 extends private SwitchPreference mPreference; - public CameraLaserSensorPreferenceControllerV2(Context context) { + public CameraLaserSensorPreferenceController(Context context) { super(context); } diff --git a/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java similarity index 96% rename from src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java rename to src/com/android/settings/development/ConnectivityMonitorPreferenceController.java index fdcecfb39a6..075af2bde13 100644 --- a/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java +++ b/src/com/android/settings/development/ConnectivityMonitorPreferenceController.java @@ -29,7 +29,7 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -public class ConnectivityMonitorPreferenceControllerV2 extends +public class ConnectivityMonitorPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { @@ -55,7 +55,7 @@ public class ConnectivityMonitorPreferenceControllerV2 extends private SwitchPreference mPreference; - public ConnectivityMonitorPreferenceControllerV2(Context context) { + public ConnectivityMonitorPreferenceController(Context context) { super(context); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 72eb30a67ad..274a65eb18e 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -257,15 +257,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra @Override public void onDisableLogPersistDialogConfirmed() { - final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController( - LogPersistPreferenceControllerV2.class); + final LogPersistPreferenceController controller = getDevelopmentOptionsController( + LogPersistPreferenceController.class); controller.onDisableLogPersistDialogConfirmed(); } @Override public void onDisableLogPersistDialogRejected() { - final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController( - LogPersistPreferenceControllerV2.class); + final LogPersistPreferenceController controller = getDevelopmentOptionsController( + LogPersistPreferenceController.class); controller.onDisableLogPersistDialogRejected(); } @@ -362,7 +362,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra BluetoothA2dpConfigStore bluetoothA2dpConfigStore) { final List controllers = new ArrayList<>(); controllers.add(new MemoryUsagePreferenceController(context)); - controllers.add(new BugReportPreferenceControllerV2(context)); + controllers.add(new BugReportPreferenceController(context)); controllers.add(new LocalBackupPasswordPreferenceController(context)); controllers.add(new StayAwakePreferenceController(context, lifecycle)); controllers.add(new HdcpCheckingPreferenceController(context)); @@ -370,23 +370,23 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new OemUnlockPreferenceController(context, activity, fragment)); controllers.add(new FileEncryptionPreferenceController(context)); controllers.add(new PictureColorModePreferenceController(context, lifecycle)); - controllers.add(new WebViewAppPreferenceControllerV2(context)); + controllers.add(new WebViewAppPreferenceController(context)); controllers.add(new CoolColorTemperaturePreferenceController(context)); controllers.add(new DisableAutomaticUpdatesPreferenceController(context)); controllers.add(new AdbPreferenceController(context, fragment)); controllers.add(new ClearAdbKeysPreferenceController(context, fragment)); controllers.add(new LocalTerminalPreferenceController(context)); - controllers.add(new BugReportInPowerPreferenceControllerV2(context)); + controllers.add(new BugReportInPowerPreferenceController(context)); controllers.add(new MockLocationAppPreferenceController(context, fragment)); controllers.add(new DebugViewAttributesPreferenceController(context)); controllers.add(new SelectDebugAppPreferenceController(context, fragment)); controllers.add(new WaitForDebuggerPreferenceController(context)); controllers.add(new EnableGpuDebugLayersPreferenceController(context)); - controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context)); - controllers.add(new LogdSizePreferenceControllerV2(context)); - controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle)); - controllers.add(new ConnectivityMonitorPreferenceControllerV2(context)); - controllers.add(new CameraLaserSensorPreferenceControllerV2(context)); + controllers.add(new VerifyAppsOverUsbPreferenceController(context)); + controllers.add(new LogdSizePreferenceController(context)); + controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle)); + controllers.add(new ConnectivityMonitorPreferenceController(context)); + controllers.add(new CameraLaserSensorPreferenceController(context)); controllers.add(new WifiDisplayCertificationPreferenceController(context)); controllers.add(new WifiVerboseLoggingPreferenceController(context)); controllers.add(new WifiAggressiveHandoverPreferenceController(context)); diff --git a/src/com/android/settings/development/LogPersistPreferenceControllerV2.java b/src/com/android/settings/development/LogPersistPreferenceController.java similarity index 95% rename from src/com/android/settings/development/LogPersistPreferenceControllerV2.java rename to src/com/android/settings/development/LogPersistPreferenceController.java index 537b71bbc5d..a958379ed8d 100644 --- a/src/com/android/settings/development/LogPersistPreferenceControllerV2.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -26,14 +26,14 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.AbstractLogpersistPreferenceController; -public class LogPersistPreferenceControllerV2 extends +public class LogPersistPreferenceController extends AbstractLogpersistPreferenceController implements PreferenceControllerMixin { private final DevelopmentSettingsDashboardFragment mFragment; private ListPreference mPreference; - public LogPersistPreferenceControllerV2(Context context, + public LogPersistPreferenceController(Context context, DevelopmentSettingsDashboardFragment fragment, Lifecycle lifecycle) { super(context, lifecycle); diff --git a/src/com/android/settings/development/LogdSizePreferenceControllerV2.java b/src/com/android/settings/development/LogdSizePreferenceController.java similarity index 91% rename from src/com/android/settings/development/LogdSizePreferenceControllerV2.java rename to src/com/android/settings/development/LogdSizePreferenceController.java index 8194c485439..65228009ce7 100644 --- a/src/com/android/settings/development/LogdSizePreferenceControllerV2.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -24,12 +24,12 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.AbstractLogdSizePreferenceController; -public class LogdSizePreferenceControllerV2 extends AbstractLogdSizePreferenceController implements +public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { private ListPreference mPreference; - public LogdSizePreferenceControllerV2(Context context) { + public LogdSizePreferenceController(Context context) { super(context); } diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java similarity index 98% rename from src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java rename to src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index 6e3035eec0a..f01da0de9c5 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -38,7 +38,7 @@ import java.util.List; /** * Controller to manage the state of "Verify apps over USB" toggle. */ -public class VerifyAppsOverUsbPreferenceControllerV2 extends +public class VerifyAppsOverUsbPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, AdbOnChangeListener, PreferenceControllerMixin { private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb"; @@ -70,7 +70,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2 extends // This field is accessed using reflection in the test, please keep name in sync. private final PackageManagerWrapper mPackageManager; - public VerifyAppsOverUsbPreferenceControllerV2(Context context) { + public VerifyAppsOverUsbPreferenceController(Context context) { super(context); mPackageManager = new PackageManagerWrapper(context.getPackageManager()); diff --git a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java b/src/com/android/settings/development/WebViewAppPreferenceController.java similarity index 96% rename from src/com/android/settings/development/WebViewAppPreferenceControllerV2.java rename to src/com/android/settings/development/WebViewAppPreferenceController.java index d061281d929..9ccb20b10f9 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceControllerV2.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -31,7 +31,7 @@ import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.wrapper.PackageManagerWrapper; -public class WebViewAppPreferenceControllerV2 extends +public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { private static final String TAG = "WebViewAppPrefCtrl"; @@ -42,7 +42,7 @@ public class WebViewAppPreferenceControllerV2 extends private Preference mPreference; - public WebViewAppPreferenceControllerV2(Context context) { + public WebViewAppPreferenceController(Context context) { super(context); mPackageManager = new PackageManagerWrapper(context.getPackageManager()); diff --git a/src/com/android/settings/webview/WebViewAppPreferenceController.java b/src/com/android/settings/webview/WebViewAppPreferenceController.java index 9410af786cc..18d874e5674 100644 --- a/src/com/android/settings/webview/WebViewAppPreferenceController.java +++ b/src/com/android/settings/webview/WebViewAppPreferenceController.java @@ -23,7 +23,7 @@ import com.android.settings.applications.defaultapps.DefaultAppInfo; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; /** - * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2} + * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceController} */ @Deprecated public class WebViewAppPreferenceController extends DefaultAppPreferenceController { diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java similarity index 92% rename from tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index 6fa1400d19f..82086dde5b3 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -16,12 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development - .BugReportInPowerPreferenceControllerV2.COMPONENT_NAME; -import static com.android.settings.development - .BugReportInPowerPreferenceControllerV2.SETTING_VALUE_OFF; -import static com.android.settings.development - .BugReportInPowerPreferenceControllerV2.SETTING_VALUE_ON; +import static com.android.settings.development.BugReportInPowerPreferenceController.COMPONENT_NAME; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_ON; import static com.google.common.truth.Truth.assertThat; @@ -53,7 +52,7 @@ import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class BugReportInPowerPreferenceControllerV2Test { +public class BugReportInPowerPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @@ -67,7 +66,7 @@ public class BugReportInPowerPreferenceControllerV2Test { private SwitchPreference mPreference; private ContentResolver mContentResolver; - private BugReportInPowerPreferenceControllerV2 mController; + private BugReportInPowerPreferenceController mController; @Before public void setUp() { @@ -75,7 +74,7 @@ public class BugReportInPowerPreferenceControllerV2Test { mContentResolver = RuntimeEnvironment.application.getContentResolver(); when(mContext.getContentResolver()).thenReturn(mContentResolver); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); - mController = new BugReportInPowerPreferenceControllerV2(mContext); + mController = new BugReportInPowerPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager); } diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java similarity index 91% rename from tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 9b4cde63652..908c519c4e8 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -36,20 +36,20 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class BugReportPreferenceControllerV2Test { +public class BugReportPreferenceControllerTest { @Mock private Context mContext; @Mock private UserManager mUserManager; - private BugReportPreferenceControllerV2 mController; + private BugReportPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); - mController = new BugReportPreferenceControllerV2(mContext); + mController = new BugReportPreferenceController(mContext); } @Test diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java similarity index 75% rename from tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index 87967b99d7d..1443d16d0e0 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -16,18 +16,16 @@ package com.android.settings.development; -import static com.android.settings.development.CameraLaserSensorPreferenceControllerV2.ENG_BUILD; -import static com.android.settings.development - .CameraLaserSensorPreferenceControllerV2.USERDEBUG_BUILD; -import static com.android.settings.development.CameraLaserSensorPreferenceControllerV2.USER_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController + .USERDEBUG_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD; import android.content.Context; -import android.content.res.Resources; import android.os.SystemProperties; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; @@ -36,7 +34,6 @@ 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.annotation.Config; @@ -50,7 +47,7 @@ import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {SettingsShadowSystemProperties.class}) -public class CameraLaserSensorPreferenceControllerV2Test { +public class CameraLaserSensorPreferenceControllerTest { @Mock private PreferenceScreen mScreen; @@ -59,13 +56,13 @@ public class CameraLaserSensorPreferenceControllerV2Test { private Context mContext; - private CameraLaserSensorPreferenceControllerV2 mController; + private CameraLaserSensorPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new CameraLaserSensorPreferenceControllerV2(mContext); + mController = new CameraLaserSensorPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); mController.displayPreference(mScreen); @@ -85,7 +82,7 @@ public class CameraLaserSensorPreferenceControllerV2Test { @Test public void isAvailable_withUserdebugBuild_shouldReturnTrue() { SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); assertThat(mController.isAvailable()).isTrue(); } @@ -93,7 +90,7 @@ public class CameraLaserSensorPreferenceControllerV2Test { @Test public void isAvailable_withEngBuild_shouldReturnTrue() { SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD); + CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD); assertThat(mController.isAvailable()).isTrue(); } @@ -101,7 +98,7 @@ public class CameraLaserSensorPreferenceControllerV2Test { @Test public void isAvailable_withUserBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USER_BUILD); + CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD); assertThat(mController.isAvailable()).isFalse(); } @@ -109,10 +106,10 @@ public class CameraLaserSensorPreferenceControllerV2Test { @Test public void updateState_cameraLaserSensorEnabled_shouldCheckedPreference() { SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR, - Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)); + CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, + Integer.toString(CameraLaserSensorPreferenceController.ENABLED)); SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mScreen); @@ -122,10 +119,10 @@ public class CameraLaserSensorPreferenceControllerV2Test { @Test public void updateState_cameraLaserSensorEnabled_shouldUncheckedPreference() { SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR, - Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED)); + CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, + Integer.toString(CameraLaserSensorPreferenceController.DISABLED)); SettingsShadowSystemProperties.set( - CameraLaserSensorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mScreen); @@ -136,20 +133,20 @@ public class CameraLaserSensorPreferenceControllerV2Test { public void onPreferenceChange_preferenceChecked_shouldEnableCameraLaserSensor() { mController.onPreferenceChange(mPreference, true); - assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED)).isEqualTo( + assertThat(Integer.toString(CameraLaserSensorPreferenceController.ENABLED)).isEqualTo( SystemProperties.get( - CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR, - Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED))); + CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, + Integer.toString(CameraLaserSensorPreferenceController.ENABLED))); } @Test public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() { mController.onPreferenceChange(mPreference, false); - assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED)).isEqualTo( + assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo( SystemProperties.get( - CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR, - Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED))); + CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, + Integer.toString(CameraLaserSensorPreferenceController.ENABLED))); } @Test @@ -165,9 +162,9 @@ public class CameraLaserSensorPreferenceControllerV2Test { verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); - assertThat(Integer.toString(CameraLaserSensorPreferenceControllerV2.DISABLED)).isEqualTo( + assertThat(Integer.toString(CameraLaserSensorPreferenceController.DISABLED)).isEqualTo( SystemProperties.get( - CameraLaserSensorPreferenceControllerV2.PROPERTY_CAMERA_LASER_SENSOR, - Integer.toString(CameraLaserSensorPreferenceControllerV2.ENABLED))); + CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR, + Integer.toString(CameraLaserSensorPreferenceController.ENABLED))); } } diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java similarity index 66% rename from tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java index 5b4f594bc90..5e99ec9929f 100644 --- a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java @@ -16,9 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.ConnectivityMonitorPreferenceControllerV2.ENG_BUILD; -import static com.android.settings.development - .ConnectivityMonitorPreferenceControllerV2.USERDEBUG_BUILD; +import static com.android.settings.development.ConnectivityMonitorPreferenceController.ENG_BUILD; +import static com.android.settings.development.ConnectivityMonitorPreferenceController + .USERDEBUG_BUILD; import static com.google.common.truth.Truth.assertThat; @@ -45,7 +45,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = SettingsShadowSystemProperties.class) -public class ConnectivityMonitorPreferenceControllerV2Test { +public class ConnectivityMonitorPreferenceControllerTest { private static final String USER_BUILD = "user"; @@ -55,14 +55,14 @@ public class ConnectivityMonitorPreferenceControllerV2Test { private SwitchPreference mPreference; private Context mContext; - private ConnectivityMonitorPreferenceControllerV2 mController; + private ConnectivityMonitorPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); SettingsShadowSystemProperties.clear(); mContext = RuntimeEnvironment.application; - mController = new ConnectivityMonitorPreferenceControllerV2(mContext); + mController = new ConnectivityMonitorPreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } @@ -70,7 +70,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); assertThat(mController.isAvailable()).isTrue(); } @@ -78,7 +78,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD); assertThat(mController.isAvailable()).isTrue(); } @@ -86,7 +86,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD); assertThat(mController.isAvailable()).isFalse(); } @@ -95,7 +95,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Config(qualifiers = "mcc999") public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); assertThat(mController.isAvailable()).isFalse(); } @@ -104,7 +104,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Config(qualifiers = "mcc999") public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, ENG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD); assertThat(mController.isAvailable()).isFalse(); } @@ -113,7 +113,7 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Config(qualifiers = "mcc999") public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USER_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD); assertThat(mController.isAvailable()).isFalse(); } @@ -121,10 +121,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.ENABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.ENABLED_STATUS); SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -134,10 +134,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS); SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -147,10 +147,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.DISABLED_STATUS); SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -160,10 +160,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() { SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS); SettingsShadowSystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD); + ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); mController.updateState(mPreference); @@ -173,29 +173,29 @@ public class ConnectivityMonitorPreferenceControllerV2Test { @Test public void onPreferenceChange_preferenceChecked_shouldEnableConnectivityMonitor() { SystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS); mController.handlePreferenceTreeClick(mPreference); - assertThat(ConnectivityMonitorPreferenceControllerV2.USER_ENABLED_STATUS).isEqualTo( + assertThat(ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS).isEqualTo( SystemProperties.get( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS)); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.DISABLED_STATUS)); } @Test public void onPreferenceChange_preferenceUnchecked_shouldDisableConnectivityMonitor() { SystemProperties.set( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS); mController.handlePreferenceTreeClick(mPreference); - assertThat(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS).isEqualTo( + assertThat(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS).isEqualTo( SystemProperties.get( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, - ConnectivityMonitorPreferenceControllerV2.DISABLED_STATUS)); + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.DISABLED_STATUS)); } @Test @@ -210,10 +210,10 @@ public class ConnectivityMonitorPreferenceControllerV2Test { mController.onDeveloperOptionsSwitchDisabled(); String mode = SystemProperties.get( - ConnectivityMonitorPreferenceControllerV2.PROPERTY_CONNECTIVITY_MONITOR, + ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR, null /* default */); - assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceControllerV2.USER_DISABLED_STATUS); + assertThat(mode).isEqualTo(ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS); verify(mPreference).setEnabled(false); verify(mPreference).setChecked(false); } diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index 5449353babe..881ee84f8c7 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -223,10 +223,10 @@ public class DevelopmentSettingsDashboardFragmentTest { @Test public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() { - final LogPersistPreferenceControllerV2 controller = mock( - LogPersistPreferenceControllerV2.class); + final LogPersistPreferenceController controller = mock( + LogPersistPreferenceController.class); doReturn(controller).when(mDashboard).getDevelopmentOptionsController( - LogPersistPreferenceControllerV2.class); + LogPersistPreferenceController.class); mDashboard.onDisableLogPersistDialogConfirmed(); verify(controller).onDisableLogPersistDialogConfirmed(); @@ -234,10 +234,10 @@ public class DevelopmentSettingsDashboardFragmentTest { @Test public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() { - final LogPersistPreferenceControllerV2 controller = mock( - LogPersistPreferenceControllerV2.class); + final LogPersistPreferenceController controller = mock( + LogPersistPreferenceController.class); doReturn(controller).when(mDashboard).getDevelopmentOptionsController( - LogPersistPreferenceControllerV2.class); + LogPersistPreferenceController.class); mDashboard.onDisableLogPersistDialogRejected(); verify(controller).onDisableLogPersistDialogRejected(); diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java similarity index 93% rename from tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index ddc0da57a7b..1dc1255514e 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {SettingsShadowSystemProperties.class}) -public class LogPersistPreferenceControllerV2Test { +public class LogPersistPreferenceControllerTest { @Mock private ListPreference mPreference; @@ -52,7 +52,7 @@ public class LogPersistPreferenceControllerV2Test { private DevelopmentSettingsDashboardFragment mFragment; private Context mContext; - private LogPersistPreferenceControllerV2 mController; + private LogPersistPreferenceController mController; private Lifecycle mLifecycle; @Before @@ -60,7 +60,7 @@ public class LogPersistPreferenceControllerV2Test { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mLifecycle = new Lifecycle(() -> mLifecycle); - mController = new LogPersistPreferenceControllerV2(mContext, mFragment, mLifecycle); + mController = new LogPersistPreferenceController(mContext, mFragment, mLifecycle); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); SystemProperties.set("ro.debuggable", "1"); mController.displayPreference(mScreen); diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java similarity index 94% rename from tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index 71766c378e8..f7be6539255 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -41,7 +41,7 @@ import org.robolectric.annotation.Config; @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {SettingsShadowSystemProperties.class}) -public class LogdSizePreferenceControllerV2Test { +public class LogdSizePreferenceControllerTest { @Mock private PreferenceScreen mScreen; @@ -61,7 +61,7 @@ public class LogdSizePreferenceControllerV2Test { private String[] mListValues; private String[] mListSummaries; private Context mContext; - private LogdSizePreferenceControllerV2 mController; + private LogdSizePreferenceController mController; @Before public void setup() { @@ -69,7 +69,7 @@ public class LogdSizePreferenceControllerV2Test { mContext = RuntimeEnvironment.application; mListValues = mContext.getResources().getStringArray(R.array.select_logd_size_values); mListSummaries = mContext.getResources().getStringArray(R.array.select_logd_size_summaries); - mController = new LogdSizePreferenceControllerV2(mContext); + mController = new LogdSizePreferenceController(mContext); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); mController.displayPreference(mScreen); } diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index 9e602955bfc..e396ebed383 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -52,7 +52,7 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class VerifyAppsOverUsbPreferenceControllerV2Test { +public class VerifyAppsOverUsbPreferenceControllerTest { @Mock private PackageManagerWrapper mPackageManager; @@ -62,11 +62,11 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test { private RestrictedSwitchPreference mPreference; @Mock - private VerifyAppsOverUsbPreferenceControllerV2.RestrictedLockUtilsDelegate + private VerifyAppsOverUsbPreferenceController.RestrictedLockUtilsDelegate mRestrictedLockUtilsDelegate; private Context mContext; - private VerifyAppsOverUsbPreferenceControllerV2 mController; + private VerifyAppsOverUsbPreferenceController mController; /** Convenience class for setting global int settings. */ class GlobalSetter { @@ -83,7 +83,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; when(mScreen.findPreference(anyString())).thenReturn(mPreference); - mController = new VerifyAppsOverUsbPreferenceControllerV2(mContext); + mController = new VerifyAppsOverUsbPreferenceController(mContext); ReflectionHelpers.setField( mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate); ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager); @@ -188,7 +188,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test { final int mode = Settings.Global.getInt(mContext.getContentResolver(), android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */); - assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_ON); + assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_ON); } @Test @@ -198,7 +198,7 @@ public class VerifyAppsOverUsbPreferenceControllerV2Test { final int mode = Settings.Global.getInt(mContext.getContentResolver(), android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */); - assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_OFF); + assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceController.SETTING_VALUE_OFF); } @Test diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java similarity index 95% rename from tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java rename to tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index 4f9540f6d32..59f6e35c73c 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerV2Test.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -43,7 +43,7 @@ import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) -public class WebViewAppPreferenceControllerV2Test { +public class WebViewAppPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @@ -57,13 +57,13 @@ public class WebViewAppPreferenceControllerV2Test { private DefaultAppInfo mAppInfo; private Context mContext; - private WebViewAppPreferenceControllerV2 mController; + private WebViewAppPreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = spy(new WebViewAppPreferenceControllerV2(mContext)); + mController = spy(new WebViewAppPreferenceController(mContext)); ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager); ReflectionHelpers.setField(mController, "mWebViewUpdateServiceWrapper", mWebViewUpdateServiceWrapper); diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java index 08ecc9b479a..9404e53a315 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPreferenceControllerTest.java @@ -31,7 +31,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; /** - * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceControllerV2} + * Deprecated in favor of {@link com.android.settings.development.WebViewAppPreferenceController} */ @Deprecated @RunWith(SettingsRobolectricTestRunner.class) From e0f7721ae29923f34fdeb7416ee7a1266f72141b Mon Sep 17 00:00:00 2001 From: Eran Messeri Date: Wed, 22 Nov 2017 17:29:38 +0000 Subject: [PATCH 04/20] CredentialStorage: Fix manual key installation. Since the introduction of user-selectability of keys into KeyChain, keys installed in KeyChain, by default, cannot be granted access by the user. This is a secure default, and means keys manually installed by the user should be explicitly marked as user-selectable. This change marks the user-added alias as user-selectable, so it can be selected, later on, by the user, from the Certificate Selection prompt. Bug: 65624467 Test: Manually with CtsVerifier (KeyChainTest). Change-Id: I618a06270a127a38b2aa3098fddfa518515bc1b1 --- .../android/settings/CredentialStorage.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index e5d40b7add0..ffbd2ce409b 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -275,6 +275,16 @@ public final class CredentialStorage extends Activity { Log.e(TAG, "Failed to install " + key + " as uid " + uid); return; } + // The key was prepended USER_PRIVATE_KEY by the CredentialHelper. However, + // KeyChain internally uses the raw alias name and only prepends USER_PRIVATE_KEY + // to the key name when interfacing with KeyStore. + // This is generally a symptom of CredentialStorage and CredentialHelper relying + // on internal implementation details of KeyChain and imitating its functionality + // rather than delegating to KeyChain for the certificate installation. + if (uid == Process.SYSTEM_UID || uid == KeyStore.UID_SELF) { + new MarkKeyAsUserSelectable( + key.replaceFirst("^" + Credentials.USER_PRIVATE_KEY, "")).execute(); + } } int flags = KeyStore.FLAG_NONE; @@ -390,6 +400,33 @@ public final class CredentialStorage extends Activity { } } + /** + * Background task to mark a given key alias as user-selectable, so that + * it can be selected by users from the Certificate Selection prompt. + */ + private class MarkKeyAsUserSelectable extends AsyncTask { + final String mAlias; + + public MarkKeyAsUserSelectable(String alias) { + mAlias = alias; + } + + @Override + protected Boolean doInBackground(Void... unused) { + try (KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this)) { + keyChainConnection.getService().setUserSelectable(mAlias, true); + return true; + } catch (RemoteException e) { + Log.w(TAG, "Failed to mark key " + mAlias + " as user-selectable."); + return false; + } catch (InterruptedException e) { + Log.w(TAG, "Failed to mark key " + mAlias + " as user-selectable."); + Thread.currentThread().interrupt(); + return false; + } + } + } + /** * Check that the caller is either certinstaller or Settings running in a profile of this user. */ From e1d5a1eaaca6039f8afaa428bf06a53dd1cf6b64 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 10:06:37 -0800 Subject: [PATCH 05/20] Increase max char limit for sim slot number - translations to other languages requires a few more characters Bug: 69672094 Test: Compiles Change-Id: I59c1ced9098b02718599a1feb7e64903e8dbd7f7 --- res/values/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 793498ebee9..5b48272389d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2676,13 +2676,13 @@ IMEI SV ICCID - + MDN - + Phone number - + MDN (sim slot %1$d) - + Phone number (sim slot %1$d) MDN on SIM From cc16feb726e76adeb18ca0ea6e841154b05815ec Mon Sep 17 00:00:00 2001 From: Antony Sargent Date: Fri, 27 Oct 2017 13:22:36 -0700 Subject: [PATCH 06/20] Update style names due to theme migration This updates some theme names to go along with a change to migrate some theme elements from SettingsLib to the support library. Bug: 64689839 Test: manual Change-Id: I31b96c321def78bbb49239faae6ba8e73aacd2fa --- .../preference_dropdown_material_settings.xml | 35 ------------------- res/values/styles_preference.xml | 8 ++--- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 res/layout/preference_dropdown_material_settings.xml diff --git a/res/layout/preference_dropdown_material_settings.xml b/res/layout/preference_dropdown_material_settings.xml deleted file mode 100644 index a3f5ab903fc..00000000000 --- a/res/layout/preference_dropdown_material_settings.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml index 056d55a0997..b8b9eb38983 100644 --- a/res/values/styles_preference.xml +++ b/res/values/styles_preference.xml @@ -20,19 +20,19 @@ - - - - From ade10ca2ef8d0f31b82f823d00554e77404a867c Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 10:12:06 -0800 Subject: [PATCH 07/20] Fix comma typo Bug: 69672170 Test: Manual Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 793498ebee9..3f493d7578b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6583,7 +6583,7 @@ imei, meid, min, prl version, imei sv network, mobile network state, service state, signal strength, mobile network type, roaming, iccid serial number, hardware version - android security patch level, baseband version, kernel version, + android security patch level, baseband version, kernel version From 32c3f96c231f50990b369d9aeb65802ef552d386 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 10:21:47 -0800 Subject: [PATCH 08/20] Move assist package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Id37a5b2e445481bc586f12a4397e7082f28ec075 --- .../assist/AssistContextPreferenceControllerTest.java | 2 +- .../assist/AssistFlashScreenPreferenceControllerTest.java | 2 +- .../settings/applications/assist/AssistSettingObserverTest.java | 2 +- .../settings/applications/assist/DefaultAssistPickerTest.java | 2 +- .../assist/DefaultAssistPreferenceControllerTest.java | 2 +- .../android/settings/applications/assist/ManageAssistTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 c59ac1884b7..253d6ea3bd8 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -46,7 +46,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 1dec8d086fa..e0622912765 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -51,7 +51,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 f0956c7bade..431cfba5654 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java @@ -29,7 +29,7 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AssistSettingObserverTest { private AssistSettingObserver mObserver; 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 65f0b4667fa..1018872a58c 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 180abbb491c..199862f2637 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -56,7 +56,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 1b4fb09a134..6abf09d5239 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java @@ -29,7 +29,7 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ManageAssistTest { private ManageAssist mSettings; From 3228ef64c222c85cda35b2d25ff7fa356709db06 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 11:18:19 -0800 Subject: [PATCH 09/20] Update DefaultAppInfoTest to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Ifb7769a1bf0b22581dac80d7343e6cb58515af26 --- .../defaultapps/DefaultAppInfoTest.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java index d4cd6dab7fe..0b933c656cd 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppInfoTest.java @@ -17,11 +17,17 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; @@ -39,7 +45,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultAppInfoTest { @Mock @@ -50,15 +56,24 @@ public class DefaultAppInfoTest { private PackageManager mPackageManager; @Mock private PackageManagerWrapper mPackageManagerWrapper; + @Mock + private ApplicationInfo mApplicationInfo; + @Mock + private Drawable mIcon; private Context mContext; private DefaultAppInfo mInfo; @Before - public void setUp() { + public void setUp() throws PackageManager.NameNotFoundException { MockitoAnnotations.initMocks(this); - mContext = RuntimeEnvironment.application; + mContext = spy(RuntimeEnvironment.application); + doReturn(mPackageManager).when(mContext).getPackageManager(); when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager); + when(mPackageManagerWrapper.getApplicationInfoAsUser(anyString(), anyInt(), + anyInt())).thenReturn(mApplicationInfo); + when(mPackageManager.loadUnbadgedItemIcon(mPackageItemInfo, mApplicationInfo)).thenReturn( + mIcon); } @Test From cde01ce7dd3e2933885563d612a2aaab810a4fca Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 11:19:00 -0800 Subject: [PATCH 10/20] move defaultapps package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I8668be1963135af3088229c440ac2aff88b77899 --- .../applications/defaultapps/DefaultAppPickerFragmentTest.java | 2 +- .../defaultapps/DefaultAppPreferenceControllerTest.java | 2 +- .../applications/defaultapps/DefaultAutofillPickerTest.java | 2 +- .../defaultapps/DefaultAutofillPreferenceControllerTest.java | 2 +- .../applications/defaultapps/DefaultBrowserPickerTest.java | 2 +- .../defaultapps/DefaultBrowserPreferenceControllerTest.java | 2 +- .../applications/defaultapps/DefaultEmergencyPickerTest.java | 2 +- .../applications/defaultapps/DefaultHomePickerTest.java | 2 +- .../defaultapps/DefaultHomePreferenceControllerTest.java | 2 +- .../DefaultPaymentSettingsPreferenceControllerTest.java | 2 +- .../applications/defaultapps/DefaultPhonePickerTest.java | 2 +- .../settings/applications/defaultapps/DefaultSmsPickerTest.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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 42a62254a0a..804df510038 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -51,7 +51,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 a02a2de57ac..f16c05e554e 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 06d3b8b13a8..61d7f344225 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -43,7 +43,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultAutofillPickerTest { private static final String TEST_APP_KEY = "foo.bar/foo.bar.Baz"; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index bc72ee4ee3f..8a181d83886 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -46,7 +46,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 e8a6c1e964c..934c4c602bb 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultBrowserPickerTest { private static final String TEST_APP_KEY = ""; 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 8d527ff2702..b3406a1be8a 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -48,7 +48,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultBrowserPreferenceControllerTest { @Mock 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 124817afe17..d499ac2747b 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultEmergencyPickerTest { private static final String TEST_APP_KEY = "test_app"; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index 4b82f1a98b5..4680a08b257 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -59,7 +59,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultHomePickerTest { private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest"; 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 8a8cc2900a6..cf19655def4 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -51,7 +51,7 @@ import java.util.Arrays; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultHomePreferenceControllerTest { @Mock 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 6a73269a913..025d50a3813 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -42,7 +42,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 f2b7db86c66..b1bea25a297 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultPhonePickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; 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 91e68eafeca..e9bdfe3ebf7 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultSmsPickerTest { private static final String TEST_APP_KEY = "com.android.settings/PickerTest"; From 3b0b8b711eddcb9aae42d7cf1d5af6b537e013bf Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 13:37:31 -0800 Subject: [PATCH 11/20] Update RecentAppsPreferenceControllerTest to sdk26 - Remove the usage of the mock context to avoid null pointers in sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I73dac0c91e56d84cdec0314a4ec5754a0a98c54b --- tests/robotests/res/values-mcc999/config.xml | 1 + tests/robotests/res/values/config.xml | 1 + .../RecentAppsPreferenceControllerTest.java | 102 ++++++++---------- 3 files changed, 46 insertions(+), 58 deletions(-) diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index c2909ac1779..a9a8d2745e0 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -18,4 +18,5 @@ false false false + false \ No newline at end of file diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml index 9e2d911b023..4004106cc9d 100644 --- a/tests/robotests/res/values/config.xml +++ b/tests/robotests/res/values/config.xml @@ -20,4 +20,5 @@ true true true + true \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 5e85f9b7e48..d0d8a3b0aa3 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -16,13 +16,30 @@ 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.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.app.Application; import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.res.Configuration; import android.os.UserHandle; import android.os.UserManager; import android.support.v7.preference.Preference; @@ -31,14 +48,13 @@ import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +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.Answers; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -47,25 +63,9 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; -import java.util.Locale; - -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.Matchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class RecentAppsPreferenceControllerTest { @Mock @@ -76,14 +76,18 @@ public class RecentAppsPreferenceControllerTest { private Preference mSeeAllPref; @Mock private PreferenceCategory mDivider; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mMockContext; @Mock private UsageStatsManager mUsageStatsManager; @Mock private UserManager mUserManager; @Mock private ApplicationsState mAppState; + @Mock + private PackageManager mPackageManager; + @Mock + private ApplicationsState.AppEntry mAppEntry; + @Mock + private ApplicationInfo mApplicationInfo; private Context mContext; private RecentAppsPreferenceController mController; @@ -91,12 +95,11 @@ public class RecentAppsPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mMockContext.getSystemService(Context.USAGE_STATS_SERVICE)) - .thenReturn(mUsageStatsManager); - when(mMockContext.getSystemService(Context.USER_SERVICE)) - .thenReturn(mUserManager); + mContext = spy(RuntimeEnvironment.application); + doReturn(mUsageStatsManager).when(mContext).getSystemService(Context.USAGE_STATS_SERVICE); + doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE); + doReturn(mPackageManager).when(mContext).getPackageManager(); - mContext = RuntimeEnvironment.application; mController = new RecentAppsPreferenceController(mContext, mAppState, null); when(mScreen.findPreference(anyString())).thenReturn(mCategory); @@ -125,7 +128,7 @@ public class RecentAppsPreferenceControllerTest { @Test public void onDisplayAndUpdateState_shouldRefreshUi() { mController = spy( - new RecentAppsPreferenceController(mMockContext, (Application) null, null)); + new RecentAppsPreferenceController(mContext, (Application) null, null)); doNothing().when(mController).refreshUi(mContext); @@ -136,11 +139,8 @@ public class RecentAppsPreferenceControllerTest { } @Test + @Config(qualifiers = "mcc999") public void display_shouldNotShowRecents_showAppInfoPreference() { - mController = new RecentAppsPreferenceController(mMockContext, mAppState, null); - when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps)) - .thenReturn(false); - mController.displayPreference(mScreen); verify(mCategory, never()).addPreference(any(Preference.class)); @@ -152,8 +152,6 @@ public class RecentAppsPreferenceControllerTest { @Test public void display_showRecents() { - when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps)) - .thenReturn(true); final List stats = new ArrayList<>(); final UsageStats stat1 = new UsageStats(); final UsageStats stat2 = new UsageStats(); @@ -172,20 +170,17 @@ public class RecentAppsPreferenceControllerTest { // stat1, stat2 are valid apps. stat3 is invalid. when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId())) - .thenReturn(mock(ApplicationsState.AppEntry.class)); + .thenReturn(mAppEntry); when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId())) - .thenReturn(mock(ApplicationsState.AppEntry.class)); + .thenReturn(mAppEntry); when(mAppState.getEntry(stat3.mPackageName, UserHandle.myUserId())) .thenReturn(null); - when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt())) - .thenReturn(new ResolveInfo()); + when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn( + new ResolveInfo()); when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong())) .thenReturn(stats); - final Configuration configuration = new Configuration(); - configuration.locale = Locale.US; - when(mMockContext.getResources().getConfiguration()).thenReturn(configuration); + mAppEntry.info = mApplicationInfo; - mController = new RecentAppsPreferenceController(mMockContext, mAppState, null); mController.displayPreference(mScreen); verify(mCategory).setTitle(R.string.recent_app_category_title); @@ -200,8 +195,6 @@ public class RecentAppsPreferenceControllerTest { @Test public void display_hasRecentButNoneDisplayable_showAppInfo() { - when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps)) - .thenReturn(true); final List stats = new ArrayList<>(); final UsageStats stat1 = new UsageStats(); final UsageStats stat2 = new UsageStats(); @@ -218,12 +211,11 @@ public class RecentAppsPreferenceControllerTest { .thenReturn(mock(ApplicationsState.AppEntry.class)); when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId())) .thenReturn(mock(ApplicationsState.AppEntry.class)); - when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt())) - .thenReturn(new ResolveInfo()); + when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn( + new ResolveInfo()); when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong())) .thenReturn(stats); - mController = new RecentAppsPreferenceController(mMockContext, mAppState, null); mController.displayPreference(mScreen); verify(mCategory, never()).addPreference(any(Preference.class)); @@ -234,8 +226,6 @@ public class RecentAppsPreferenceControllerTest { @Test public void display_showRecents_formatSummary() { - when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps)) - .thenReturn(true); final List stats = new ArrayList<>(); final UsageStats stat1 = new UsageStats(); stat1.mLastTimeUsed = System.currentTimeMillis(); @@ -243,17 +233,13 @@ public class RecentAppsPreferenceControllerTest { stats.add(stat1); when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId())) - .thenReturn(mock(ApplicationsState.AppEntry.class)); - when(mMockContext.getPackageManager().resolveActivity(any(Intent.class), anyInt())) - .thenReturn(new ResolveInfo()); + .thenReturn(mAppEntry); + when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn( + new ResolveInfo()); when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong())) - .thenReturn(stats); + .thenReturn(stats); + mAppEntry.info = mApplicationInfo; - final Configuration configuration = new Configuration(); - configuration.locale = Locale.US; - when(mMockContext.getResources().getConfiguration()).thenReturn(configuration); - - mController = new RecentAppsPreferenceController(mMockContext, mAppState, null); mController.displayPreference(mScreen); verify(mCategory).addPreference(argThat(summaryMatches("0 min. ago"))); From 85aa1ea1293f8f2071ebd0e0892a57251a610356 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 12:04:43 -0800 Subject: [PATCH 12/20] Update viewholder tests to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I81bfdff059255b3e7a20270dea62ffd56cc53ad5 --- .../MusicViewHolderControllerTest.java | 10 +++++++--- .../PhotosViewHolderControllerTest.java | 13 +++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) 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 fc761ccb253..c7f2f535e39 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -17,6 +17,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.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,6 +28,7 @@ import android.content.Intent; import android.os.UserHandle; import android.os.storage.VolumeInfo; import android.provider.DocumentsContract; +import android.text.format.Formatter; import android.view.View; import android.widget.FrameLayout; @@ -46,7 +48,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class MusicViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; @@ -75,7 +77,8 @@ public class MusicViewHolderControllerTest { public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() { mController.setupView(mHolder); - assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B"); + assertThat(mHolder.mSummary.getText().toString()).isEqualTo( + Formatter.formatFileSize(mContext, 0)); } @Test @@ -86,7 +89,8 @@ public class MusicViewHolderControllerTest { mController.queryStats(); mController.setupView(mHolder); - assertThat(mHolder.mSummary.getText().toString()).isEqualTo("1.00 B"); + assertThat(mHolder.mSummary.getText().toString()).isEqualTo( + Formatter.formatFileSize(mContext, 1)); } @Test diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index 0a147ac32fd..fd259217247 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -17,6 +17,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.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.storage.VolumeInfo; +import android.text.format.Formatter; import android.view.View; import android.widget.FrameLayout; @@ -44,11 +46,12 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PhotosViewHolderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Fragment mFragment; - @Mock private StorageStatsSource mSource; + @Mock + private StorageStatsSource mSource; private Context mContext; private PhotosViewHolderController mController; @@ -74,7 +77,8 @@ public class PhotosViewHolderControllerTest { public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() { mController.setupView(mHolder); - assertThat(mHolder.mSummary.getText().toString()).isEqualTo("0.00 B"); + assertThat(mHolder.mSummary.getText().toString()).isEqualTo( + Formatter.formatFileSize(mContext, 0)); } @Test @@ -85,7 +89,8 @@ public class PhotosViewHolderControllerTest { mController.queryStats(); mController.setupView(mHolder); - assertThat(mHolder.mSummary.getText().toString()).isEqualTo("11.00 B"); + assertThat(mHolder.mSummary.getText().toString()).isEqualTo( + Formatter.formatFileSize(mContext, 11)); } @Test From 90dd4b668ac747c783e2892b1555cb9276a612eb Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 12:05:11 -0800 Subject: [PATCH 13/20] move manageapplications to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I84b62392a4a4d55c1d4e6a9eadc5910e4b9a8530 --- .../applications/manageapplications/AppFilterItemTest.java | 2 +- .../applications/manageapplications/AppFilterRegistryTest.java | 2 +- .../manageapplications/ApplicationViewHolderTest.java | 2 +- .../applications/manageapplications/ManageApplicationsTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 982fb564756..2dde6f4f24b 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -35,7 +35,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 3fe5e67d6ce..ccd8470272a 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -60,7 +60,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 c32b262719d..ebc0ddc7a76 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -37,7 +37,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 dfe8e4c905f..d208194a227 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -73,7 +73,7 @@ import java.util.ArrayList; @RunWith(SettingsRobolectricTestRunner.class) // TODO: Consider making the shadow class set global using a robolectric.properties file. @Config(manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowTheme.class, From b83fd6c3d1b6d4d9321c6f8858a8ab996fd463e7 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 14:55:02 -0800 Subject: [PATCH 14/20] Update tests to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8 --- .../applications/AppInfoWithHeader.java | 6 ++-- ...mergencyBroadcastPreferenceController.java | 6 ++-- ...pAndNotificationDashboardFragmentTest.java | 30 ++++++++++++------ .../applications/AppInfoWithHeaderTest.java | 15 ++++----- .../AppStorageSizesControllerTest.java | 31 +++++++++---------- .../applications/InstalledAppDetailsTest.java | 11 ++++--- 6 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 3df81c74c7e..af0cf5b47bb 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -16,6 +16,8 @@ package com.android.settings.applications; +import static com.android.settings.widget.EntityHeaderController.ActionType; + import android.app.Activity; import android.os.Bundle; import android.support.v7.preference.Preference; @@ -25,8 +27,6 @@ import android.util.Log; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; -import static com.android.settings.widget.EntityHeaderController.ActionType; - public abstract class AppInfoWithHeader extends AppInfoBase { private boolean mCreated; @@ -44,7 +44,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase { final Preference pref = EntityHeaderController .newInstance(activity, this, null /* header */) .setRecyclerView(getListView(), getLifecycle()) - .setIcon(IconDrawableFactory.newInstance(activity) + .setIcon(IconDrawableFactory.newInstance(getContext()) .getBadgedIcon(mPackageInfo.applicationInfo)) .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) .setSummary(mPackageInfo) diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java index d6291a8ffaa..2eb9f6a1b2a 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -40,7 +40,6 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo private AccountRestrictionHelper mHelper; private UserManager mUserManager; private PackageManager mPm; - private boolean mCellBroadcastAppLinkEnabled; public EmergencyBroadcastPreferenceController(Context context, String prefKey) { this(context, new AccountRestrictionHelper(context), prefKey); @@ -54,8 +53,6 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo mHelper = helper; mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mPm = mContext.getPackageManager(); - // Enable link to CMAS app settings depending on the value in config.xml. - mCellBroadcastAppLinkEnabled = isCellBroadcastAppLinkEnabled(); } @Override @@ -79,12 +76,13 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo @Override public boolean isAvailable() { - return mUserManager.isAdminUser() && mCellBroadcastAppLinkEnabled + return mUserManager.isAdminUser() && isCellBroadcastAppLinkEnabled() && !mHelper.hasBaseUserRestriction( UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId()); } private boolean isCellBroadcastAppLinkEnabled() { + // Enable link to CMAS app settings depending on the value in config.xml. boolean enabled = mContext.getResources().getBoolean( com.android.internal.R.bool.config_cellBroadcastAppLinks); if (enabled) { diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java index 5a798f984c1..55141f77dbd 100644 --- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java @@ -16,32 +16,35 @@ package com.android.settings.applications; -import android.content.Context; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; import android.os.UserManager; -import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; +import com.android.settings.notification.EmergencyBroadcastPreferenceController; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.util.ReflectionHelpers; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; import java.util.List; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppAndNotificationDashboardFragmentTest { @Test + @Config(shadows = {ShadowEmergencyBroadcastPreferenceController.class}) public void testNonIndexableKeys_existInXmlLayout() { final Context context = spy(RuntimeEnvironment.application); UserManager manager = mock(UserManager.class); @@ -56,4 +59,13 @@ public class AppAndNotificationDashboardFragmentTest { assertThat(keys).containsAllIn(niks); } + + @Implements(EmergencyBroadcastPreferenceController.class) + public static class ShadowEmergencyBroadcastPreferenceController { + + @Implementation + public boolean isAvailable() { + return true; + } + } } diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 62395f3063d..75ae4582e4f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -16,6 +16,13 @@ package com.android.settings.applications; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.Context; @@ -49,14 +56,8 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index 027bd33f835..62cb26c452f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -8,8 +8,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.support.v7.preference.Preference; -import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.R; import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; import org.junit.Before; import org.junit.Test; @@ -18,11 +20,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import com.android.settings.R; -import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; - @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppStorageSizesControllerTest { private static final String COMPUTING = "Computing…"; private static final String INVALID_SIZE = "Couldn’t compute package size."; @@ -85,9 +84,9 @@ public class AppStorageSizesControllerTest { mController.setResult(result); mController.updateUi(mContext); - assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); - assertThat(mCachePreference.getSummary()).isEqualTo("10.00 B"); - assertThat(mDataPreference.getSummary()).isEqualTo("90.00 B"); + assertThat(mAppPreference.getSummary()).isEqualTo("1 B"); + assertThat(mCachePreference.getSummary()).isEqualTo("10 B"); + assertThat(mDataPreference.getSummary()).isEqualTo("90 B"); assertThat(mTotalPreference.getSummary()).isEqualTo("101 B"); } @@ -103,10 +102,10 @@ public class AppStorageSizesControllerTest { mController.setCacheCleared(true); mController.updateUi(mContext); - assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); - assertThat(mCachePreference.getSummary()).isEqualTo("0.00 B"); - assertThat(mDataPreference.getSummary()).isEqualTo("90.00 B"); - assertThat(mTotalPreference.getSummary()).isEqualTo("91.00 B"); + assertThat(mAppPreference.getSummary()).isEqualTo("1 B"); + assertThat(mCachePreference.getSummary()).isEqualTo("0 B"); + assertThat(mDataPreference.getSummary()).isEqualTo("90 B"); + assertThat(mTotalPreference.getSummary()).isEqualTo("91 B"); } @Test @@ -121,9 +120,9 @@ public class AppStorageSizesControllerTest { mController.setDataCleared(true); mController.updateUi(mContext); - assertThat(mAppPreference.getSummary()).isEqualTo("1.00 B"); - assertThat(mCachePreference.getSummary()).isEqualTo("0.00 B"); - assertThat(mDataPreference.getSummary()).isEqualTo("0.00 B"); - assertThat(mTotalPreference.getSummary()).isEqualTo("1.00 B"); + assertThat(mAppPreference.getSummary()).isEqualTo("1 B"); + assertThat(mCachePreference.getSummary()).isEqualTo("0 B"); + assertThat(mDataPreference.getSummary()).isEqualTo("0 B"); + assertThat(mTotalPreference.getSummary()).isEqualTo("1 B"); } } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java index 58a957704de..b8a27b9d833 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.anyInt; @@ -83,9 +84,9 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config( - manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, - shadows = InstalledAppDetailsTest.ShadowUtils.class + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION_O, + shadows = InstalledAppDetailsTest.ShadowUtils.class ) public final class InstalledAppDetailsTest { @@ -192,7 +193,7 @@ public final class InstalledAppDetailsTest { when(stats.getTotalBytes()).thenReturn(1L); assertThat(InstalledAppDetails.getStorageSummary(context, stats, true)) - .isEqualTo("1.00 B used in external storage"); + .isEqualTo("1 B used in external storage"); } @Test @@ -202,7 +203,7 @@ public final class InstalledAppDetailsTest { when(stats.getTotalBytes()).thenReturn(1L); assertThat(InstalledAppDetails.getStorageSummary(context, stats, false)) - .isEqualTo("1.00 B used in internal storage"); + .isEqualTo("1 B used in internal storage"); } @Test From 253cb2fbc366bc899aa52204e25b525a233def17 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 14:55:38 -0800 Subject: [PATCH 15/20] Move applications test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I9815f48ed9c6ddcfdae10cf09fbdf742a7066dfa --- .../applications/AppPermissionsPreferenceControllerTest.java | 2 +- .../android/settings/applications/AppStateAppOpsBridgeTest.java | 2 +- .../settings/applications/AppStateInstallAppsBridgeTest.java | 2 +- .../android/settings/applications/AppStorageSettingsTest.java | 2 +- .../applications/AppWithAdminGrantedPermissionsCounterTest.java | 2 +- .../applications/AppWithAdminGrantedPermissionsListerTest.java | 2 +- .../applications/ApplicationFeatureProviderImplTest.java | 2 +- .../android/settings/applications/DefaultAppSettingsTest.java | 2 +- .../android/settings/applications/DrawOverlayDetailsTest.java | 2 +- .../settings/applications/EnterpriseDefaultAppsTest.java | 2 +- .../applications/FetchPackageStorageAsyncLoaderTest.java | 2 +- .../android/settings/applications/InstalledAppCounterTest.java | 2 +- .../android/settings/applications/InstalledAppListerTest.java | 2 +- .../com/android/settings/applications/NotificationAppsTest.java | 2 +- .../settings/applications/PictureInPictureDetailsTest.java | 2 +- .../settings/applications/PictureInPictureSettingsTest.java | 2 +- .../com/android/settings/applications/PremiumSmsAccessTest.java | 2 +- .../applications/SpecialAppAccessPreferenceControllerTest.java | 2 +- .../android/settings/applications/UsageAccessDetailsTest.java | 2 +- .../android/settings/applications/VrListenerSettingsTest.java | 2 +- .../android/settings/applications/WriteSettingsDetailsTest.java | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 2e522142290..b0f0d0c25cc 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -46,7 +46,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 d63697ec5a4..6fadb4327c5 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java @@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class AppStateAppOpsBridgeTest { @Mock private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java index 62623e58cec..c88f878d993 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppStateInstallAppsBridgeTest { @Test diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java index 1f6aea4fcd7..d2540745e72 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java @@ -45,7 +45,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppStorageSettingsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index 33d261f807b..eb3d94f2b16 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -56,7 +56,7 @@ import static org.mockito.Mockito.when; * Tests for {@link InstalledAppCounter}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class AppWithAdminGrantedPermissionsCounterTest { private final String APP_1 = "app1"; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 2e9328ab6e6..d7c80590010 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.when; * Tests for {@link AppWithAdminGrantedPermissionsLister}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 e5b7a66e79d..dad02ef4545 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.when; * Tests for {@link ApplicationFeatureProviderImpl}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {ShadowUserManager.class}) public final class ApplicationFeatureProviderImplTest { diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index 9441707a4b4..78ec2657ad1 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -52,7 +52,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultAppSettingsTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java index 5d20a4c9cc3..38c01282c23 100644 --- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java @@ -46,7 +46,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DrawOverlayDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java index 10caf13f24d..8014dbbe2df 100644 --- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java @@ -27,7 +27,7 @@ import org.robolectric.annotation.Config; import static junit.framework.Assert.assertTrue; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class EnterpriseDefaultAppsTest { @Test public void testNumberOfIntentsCorrelateWithUI() throws Exception { diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 3269acb1e29..d34b2eb46f9 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -44,7 +44,7 @@ import org.robolectric.annotation.Config; import java.io.IOException; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class FetchPackageStorageAsyncLoaderTest { private static final String PACKAGE_NAME = "com.test.package"; @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index 58c4386661f..def87586084 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -61,7 +61,7 @@ import java.util.Set; * Tests for {@link InstalledAppCounter}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {ShadowUserManager.class}) public final class InstalledAppCounterTest { diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index c74deaeb5cf..6a5cfeba343 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -57,7 +57,7 @@ import static org.mockito.Mockito.when; * Tests for {@link InstalledAppLister}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class InstalledAppListerTest { private final String APP_1 = "app1"; diff --git a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java index 11d757fc504..735a811ae02 100644 --- a/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java +++ b/tests/robotests/src/com/android/settings/applications/NotificationAppsTest.java @@ -49,7 +49,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class NotificationAppsTest { @Mock diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java index 02b8c7a003c..b998b81e215 100644 --- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java @@ -39,7 +39,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PictureInPictureDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java index d379dbd10a0..85b398aa1d5 100644 --- a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java @@ -51,7 +51,7 @@ import java.util.ArrayList; import java.util.Collections; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PictureInPictureSettingsTest { private static final int PRIMARY_USER_ID = 0; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java index 30ebcde0c2d..dedb61d54e8 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java @@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PremiumSmsAccessTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index f17addd64bb..09bfc292d78 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -36,7 +36,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class SpecialAppAccessPreferenceControllerTest { private Context mContext; @Mock diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 1a3aeb5b981..64ef4ff4159 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -41,7 +41,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UsageAccessDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java index d2f1bbddefb..5f9ec95e09c 100644 --- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java @@ -36,7 +36,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class VrListenerSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java index a995394d031..6cd07e3e880 100644 --- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java @@ -36,7 +36,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class WriteSettingsDetailsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) From 60d1b38051c1260f562390367487140e85d3c369 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 15:14:12 -0800 Subject: [PATCH 16/20] Move backup package tests to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I016e8ae3336544c4c75ead96d06e4b461ed13773 --- .../backup/BackupSettingsActivityPreferenceControllerTest.java | 2 +- .../com/android/settings/backup/BackupSettingsActivityTest.java | 2 +- .../com/android/settings/backup/BackupSettingsHelperTest.java | 2 +- .../settings/backup/BackupSettingsPreferenceControllerTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index 5fc3ebcae8c..39cc9a2a815 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -45,7 +45,7 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class}) public class BackupSettingsActivityPreferenceControllerTest { private static final String KEY_BACKUP_SETTINGS = "backup_settings"; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index 44c7e101478..cf3cb53b102 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -58,7 +58,7 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class, BackupSettingsActivityTest.ShadowUserHandle.class}) public class BackupSettingsActivityTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index 9de0c6a3c2e..eb33cd632db 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -50,7 +50,7 @@ import com.android.settings.TestConfig; import com.android.settingslib.drawer.SettingsDrawerActivity; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class}) public class BackupSettingsHelperTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 3ad49e7cc5e..83d970907c2 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -41,7 +41,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class}) public class BackupSettingsPreferenceControllerTest { private static final String BACKUP_SETTINGS = "backup_settings"; From 4824ff3d008fb7165293df8673490f3e79987d63 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 15:42:25 -0800 Subject: [PATCH 17/20] Move bluetooth test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I26e6f437052caafd97f3f164b388d379fc890e7e --- .../android/settings/bluetooth/AlwaysDiscoverableTest.java | 2 +- .../bluetooth/BluetoothDetailsButtonsControllerTest.java | 2 +- .../bluetooth/BluetoothDetailsControllerTestBase.java | 6 ++++++ .../bluetooth/BluetoothDeviceDetailsFragmentTest.java | 2 +- .../BluetoothDeviceNamePreferenceControllerTest.java | 2 +- .../settings/bluetooth/BluetoothDevicePreferenceTest.java | 2 +- .../BluetoothDeviceRenamePreferenceControllerTest.java | 2 +- .../android/settings/bluetooth/BluetoothEnablerTest.java | 2 +- .../bluetooth/BluetoothFilesPreferenceControllerTest.java | 2 +- .../BluetoothMasterSwitchPreferenceControllerTest.java | 2 +- .../settings/bluetooth/BluetoothPairingDetailTest.java | 2 +- .../settings/bluetooth/BluetoothPairingDialogTest.java | 2 +- .../bluetooth/BluetoothPairingPreferenceControllerTest.java | 2 +- .../bluetooth/BluetoothSettingsSummaryProviderTest.java | 2 +- .../android/settings/bluetooth/BluetoothSettingsTest.java | 2 +- .../settings/bluetooth/BluetoothSummaryUpdaterTest.java | 2 +- .../bluetooth/DeviceListPreferenceFragmentTest.java | 2 +- .../settings/bluetooth/DevicePickerFragmentTest.java | 2 +- .../settings/bluetooth/DeviceProfilesSettingsTest.java | 2 +- .../settings/bluetooth/ForgetDeviceDialogFragmentTest.java | 2 +- .../bluetooth/RemoteDeviceNameDialogFragmentTest.java | 2 +- .../src/com/android/settings/bluetooth/UtilsTest.java | 2 +- 22 files changed, 27 insertions(+), 21 deletions(-) diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index fd46b4b3727..3cc90bd94c8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -41,7 +41,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AlwaysDiscoverableTest { @Mock private LocalBluetoothAdapter mLocalAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 7b0a3f23f03..e7ce7e07077 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -43,7 +43,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = SettingsShadowBluetoothDevice.class) public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase { private BluetoothDetailsButtonsController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 33a5ed59438..b03ecc102aa 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -28,14 +28,20 @@ import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothDetailsControllerTestBase { protected Context mContext; protected Lifecycle mLifecycle; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 544b5903c9c..cd07a905066 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -53,7 +53,7 @@ import org.robolectric.annotation.Config; import org.robolectric.fakes.RoboMenu; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothDeviceDetailsFragmentTest { private BluetoothDeviceDetailsFragment mFragment; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index 2e094e24071..93de52d63c4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -40,7 +40,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothDeviceNamePreferenceControllerTest { private static final String DEVICE_NAME = "Nightshade"; private static final int ORDER = 1; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index bc1151bbb6a..3dd97bb0753 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -49,7 +49,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = SettingsShadowResources.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 cde95cd5b16..186e274855d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -43,7 +43,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothDeviceRenamePreferenceControllerTest { private static final String DEVICE_NAME = "Nightshade"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index b973edb674d..102f0a76127 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -58,7 +58,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = { +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class }) public class BluetoothEnablerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index cdaf87637ce..ed63fc45edf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -35,7 +35,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothFilesPreferenceControllerTest { private Context mContext; private BluetoothFilesPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java index c9d57461c62..534cace1745 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java @@ -47,7 +47,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothMasterSwitchPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index d1d49354403..2b30ae404cf 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -52,7 +52,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothPairingDetailTest { @Mock diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index fba11de8066..25a24d4a381 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -53,7 +53,7 @@ import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.FragmentTestUtil; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows=ShadowEventLogWriter.class) public class BluetoothPairingDialogTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 4459f6197e4..192e447fc30 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -49,7 +49,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothPairingPreferenceControllerTest { private static final int ORDER = 1; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java index 0061ee52ea1..e7a66fabe1c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java @@ -35,7 +35,7 @@ import org.robolectric.annotation.Config; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothSettingsSummaryProviderTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java index c772560d717..b17772962b3 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java @@ -50,7 +50,7 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothSettingsTest { private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 0c27412c551..cb04347cdb8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -51,7 +51,7 @@ import java.util.HashSet; import java.util.Set; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BluetoothSummaryUpdaterTest { private static final String DEVICE_NAME = "Nightshade"; private static final String DEVICE_KEYBOARD_NAME = "Bluetooth Keyboard"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 49efecbc42c..169db240ee8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -49,7 +49,7 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DeviceListPreferenceFragmentTest { private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx"; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java index 3294ffd0405..f9b392e926c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java @@ -30,7 +30,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DevicePickerFragmentTest { @Mock private LocalBluetoothAdapter mLocalAdapter; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index a6793bb20df..56454b8f67c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -56,7 +56,7 @@ import java.util.ArrayList; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = { +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = { ShadowEventLogWriter.class }) public class DeviceProfilesSettingsTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index 93437212bdb..71e99330866 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -46,7 +46,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowDialog; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ForgetDeviceDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index a8ef4e6df5c..65fe46c4e0b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -50,7 +50,7 @@ import org.robolectric.shadows.ShadowDialog; import org.robolectric.util.FragmentTestUtil; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class RemoteDeviceNameDialogFragmentTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java index e0d46388f44..43583ed29d7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = SettingsShadowResources.class) public class UtilsTest { From d816465bb3a49a7311c1cd681e6986fd8c339c37 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 16:46:52 -0800 Subject: [PATCH 18/20] Move datausage test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I10d2d0eb9abafe8a81adab3ce3f5db2f1f3337b8 --- .../android/settings/datausage/AppDataUsagePreferenceTest.java | 2 +- .../src/com/android/settings/datausage/AppDataUsageTest.java | 2 +- .../src/com/android/settings/datausage/AppPrefLoaderTest.java | 2 +- .../android/settings/datausage/BillingCycleSettingsTest.java | 2 +- .../settings/datausage/DataPlanSummaryPreferenceTest.java | 2 +- .../android/settings/datausage/DataPlanUsageSummaryTest.java | 2 +- .../settings/datausage/DataPlansSyncTimePreferenceTest.java | 2 +- .../android/settings/datausage/DataUsageInfoControllerTest.java | 2 +- .../src/com/android/settings/datausage/DataUsageListTest.java | 2 +- .../com/android/settings/datausage/DataUsageSummaryTest.java | 2 +- .../src/com/android/settings/datausage/DataUsageUtilsTest.java | 2 +- .../settings/datausage/ManageDataPlansPreferenceTest.java | 2 +- .../android/settings/datausage/UnrestrictedDataAccessTest.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 15ca6e4acfd..4f7e2167725 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = ShadowThreadUtils.class) public class AppDataUsagePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 26071ed07db..75fec68bfca 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -57,7 +57,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = ShadowEntityHeaderController.class) public class AppDataUsageTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index ac28e1defaf..b6547ab525e 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -44,7 +44,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppPrefLoaderTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 8b635d24ead..d735342d598 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BillingCycleSettingsTest { private static final int LIMIT_BYTES = 123; diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java index 9ddce537032..a5dea972c66 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java @@ -38,7 +38,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java index 748c3173793..cf790e917eb 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java @@ -45,7 +45,7 @@ import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataPlanUsageSummaryTest { @Mock private ConnectivityManager mManager; diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java index ba2d5f15ba5..1e2565e5646 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java @@ -35,7 +35,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class DataPlansSyncTimePreferenceTest { private static final String SYNC_TIME = "Today 12:24pm"; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index e60243bf846..57041fd54b9 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -13,7 +13,7 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageInfoControllerTest { private DataUsageInfoController mInfoController; private DataUsageInfo info; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 9ab88d3a805..59c99f44fe9 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageListTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index dc53ca104ea..179f74373e4 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -48,7 +48,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageSummaryTest { @Mock private ConnectivityManager mManager; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index cdcd3a992e9..1dacc685f03 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -33,7 +33,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class DataUsageUtilsTest { @Mock private ConnectivityManager mManager; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java index 6eff393cd0e..e96b4e8a8b1 100644 --- a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java @@ -35,7 +35,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class ManageDataPlansPreferenceTest { private Preference mPreference; private PreferenceViewHolder mHolder; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index f20e50c3e12..081337f9ba8 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -40,7 +40,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UnrestrictedDataAccessTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) From 5e98d62c1993dadb9eca6dec864f9327bc62f872 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 17:05:06 -0800 Subject: [PATCH 19/20] Move datetime package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I0b93682625e15a6306f5fbd3409d4a4003beb805 --- .../datetime/AutoTimeFormatPreferenceControllerTest.java | 2 +- .../settings/datetime/AutoTimePreferenceControllerTest.java | 2 +- .../settings/datetime/AutoTimeZonePreferenceControllerTest.java | 2 +- .../android/settings/datetime/DatePreferenceControllerTest.java | 2 +- .../android/settings/datetime/TimeChangeListenerMixinTest.java | 2 +- .../settings/datetime/TimeFormatPreferenceControllerTest.java | 2 +- .../android/settings/datetime/TimePreferenceControllerTest.java | 2 +- .../settings/datetime/TimeZonePreferenceControllerTest.java | 2 +- .../com/android/settings/datetime/ZonePickerComparatorTest.java | 2 +- .../src/com/android/settings/datetime/ZonePickerTest.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index 06969bb92b4..f9784efec6b 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -40,7 +40,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AutoTimeFormatPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index d28cad1d785..f4c15963a20 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -35,7 +35,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 5cbef7282d0..950fd0d4bb5 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, 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 f1d34f8219a..000dd2ca9db 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 ada59f4513c..524a88e4a24 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 cd135130b18..2e975c3887f 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -41,7 +41,7 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class TimeFormatPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index 89c5f47e935..afec523594a 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) 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 ec26448f0ca..aa10a7038b2 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class TimeZonePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java index 4c1794ceff7..10e5e5c2b01 100644 --- a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java +++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java @@ -23,7 +23,7 @@ import java.util.TimeZone; import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ZonePickerComparatorTest { // Strings in Chinese are sorted by alphabet order of their Pinyin. diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java index 92807e9fcf3..09ff1cdcc54 100644 --- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java @@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ZonePickerTest { private Activity mActivity; From 0fccd4d49e1582b90b0ad8c87fb14cb317d849f1 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 17:09:51 -0800 Subject: [PATCH 20/20] Move datausage test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Ie09794d6d32794ac40c3e6587b81fc108b445c9c --- .../android/settings/datausage/AppDataUsagePreferenceTest.java | 2 +- .../src/com/android/settings/datausage/AppDataUsageTest.java | 2 +- .../src/com/android/settings/datausage/AppPrefLoaderTest.java | 2 +- .../android/settings/datausage/BillingCycleSettingsTest.java | 2 +- .../settings/datausage/DataPlanSummaryPreferenceTest.java | 2 +- .../android/settings/datausage/DataPlanUsageSummaryTest.java | 2 +- .../settings/datausage/DataPlansSyncTimePreferenceTest.java | 2 +- .../android/settings/datausage/DataUsageInfoControllerTest.java | 2 +- .../src/com/android/settings/datausage/DataUsageListTest.java | 2 +- .../com/android/settings/datausage/DataUsageSummaryTest.java | 2 +- .../src/com/android/settings/datausage/DataUsageUtilsTest.java | 2 +- .../settings/datausage/ManageDataPlansPreferenceTest.java | 2 +- .../android/settings/datausage/UnrestrictedDataAccessTest.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 15ca6e4acfd..4f7e2167725 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -39,7 +39,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = ShadowThreadUtils.class) public class AppDataUsagePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 26071ed07db..75fec68bfca 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -57,7 +57,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = ShadowEntityHeaderController.class) public class AppDataUsageTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index ac28e1defaf..b6547ab525e 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -44,7 +44,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppPrefLoaderTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index 8b635d24ead..d735342d598 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class BillingCycleSettingsTest { private static final int LIMIT_BYTES = 123; diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java index 9ddce537032..a5dea972c66 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java @@ -38,7 +38,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java index 748c3173793..cf790e917eb 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java @@ -45,7 +45,7 @@ import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataPlanUsageSummaryTest { @Mock private ConnectivityManager mManager; diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java index ba2d5f15ba5..1e2565e5646 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlansSyncTimePreferenceTest.java @@ -35,7 +35,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class DataPlansSyncTimePreferenceTest { private static final String SYNC_TIME = "Today 12:24pm"; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java index e60243bf846..57041fd54b9 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java @@ -13,7 +13,7 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageInfoControllerTest { private DataUsageInfoController mInfoController; private DataUsageInfo info; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 9ab88d3a805..59c99f44fe9 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageListTest { @Mock diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index dc53ca104ea..179f74373e4 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -48,7 +48,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DataUsageSummaryTest { @Mock private ConnectivityManager mManager; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index cdcd3a992e9..1dacc685f03 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -33,7 +33,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class DataUsageUtilsTest { @Mock private ConnectivityManager mManager; private Context mContext; diff --git a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java index 6eff393cd0e..e96b4e8a8b1 100644 --- a/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ManageDataPlansPreferenceTest.java @@ -35,7 +35,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public final class ManageDataPlansPreferenceTest { private Preference mPreference; private PreferenceViewHolder mHolder; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index f20e50c3e12..081337f9ba8 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -40,7 +40,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UnrestrictedDataAccessTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS)