From 9c8fe7e78a2948f654382e739540b6eba97ac066 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Tue, 28 Nov 2017 14:49:19 -0800 Subject: [PATCH 1/2] Update ApplicationListPreferenceCtrlTest to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I1b81bbdf63e9baf07f2db4eda71243c7cdab834e --- .../ApplicationListPreferenceControllerTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index 81223a5aa79..963b2cefa7a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -17,11 +17,15 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +33,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.UserInfo; +import android.os.UserManager; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; @@ -54,7 +59,7 @@ import java.util.List; 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 ApplicationListPreferenceControllerTest { private static final int MAIN_USER_ID = 0; @@ -74,6 +79,8 @@ public class ApplicationListPreferenceControllerTest { private PackageManager mPackageManager; @Mock(answer = RETURNS_DEEP_STUBS) private SettingsPreferenceFragment mFragment; + @Mock + private UserManager mUserManager; private Context mContext; private ApplicationListPreferenceController mController; @@ -82,7 +89,8 @@ public class ApplicationListPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); final ShadowApplication shadowContext = ShadowApplication.getInstance(); - mContext = shadowContext.getApplicationContext(); + mContext = spy(shadowContext.getApplicationContext()); + doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); when(mFragment.getPreferenceScreen()).thenReturn(mScreen); when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext); when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1); From e155871920c2f877890e3ee32ec61f78738e5e7d Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Tue, 28 Nov 2017 14:50:02 -0800 Subject: [PATCH 2/2] Move enterprise test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I6b4c5d1d2ba9e7f48168c545432a5a62d024f43d --- .../enterprise/AdminActionPreferenceControllerBaseTest.java | 2 +- .../AdminGrantedCameraPermissionPreferenceControllerTest.java | 2 +- ...AdminGrantedLocationPermissionsPreferenceControllerTest.java | 2 +- ...dminGrantedMicrophonePermissionPreferenceControllerTest.java | 2 +- .../AdminGrantedPermissionsPreferenceControllerBaseTest.java | 2 +- .../AlwaysOnVpnCurrentUserPreferenceControllerTest.java | 2 +- .../AlwaysOnVpnManagedProfilePreferenceControllerTest.java | 2 +- .../settings/enterprise/ApplicationListFragmentTest.java | 2 +- .../settings/enterprise/BugReportsPreferenceControllerTest.java | 2 +- .../enterprise/CaCertsCurrentUserPreferenceControllerTest.java | 2 +- .../CaCertsManagedProfilePreferenceControllerTest.java | 2 +- .../enterprise/CaCertsPreferenceControllerBaseTest.java | 2 +- .../EnterpriseInstalledPackagesPreferenceControllerTest.java | 2 +- .../enterprise/EnterprisePrivacyFeatureProviderImplTest.java | 2 +- .../enterprise/EnterprisePrivacyPreferenceControllerTest.java | 2 +- .../settings/enterprise/EnterprisePrivacySettingsTest.java | 2 +- .../enterprise/EnterpriseSetDefaultAppsListFragmentTest.java | 2 +- .../EnterpriseSetDefaultAppsListPreferenceControllerTest.java | 2 +- .../EnterpriseSetDefaultAppsPreferenceControllerTest.java | 2 +- .../FailedPasswordWipeCurrentUserPreferenceControllerTest.java | 2 +- ...ailedPasswordWipeManagedProfilePreferenceControllerTest.java | 2 +- .../FailedPasswordWipePreferenceControllerBaseTest.java | 2 +- .../enterprise/GlobalHttpProxyPreferenceControllerTest.java | 2 +- .../settings/enterprise/ImePreferenceControllerTest.java | 2 +- .../enterprise/ManageDeviceAdminPreferenceControllerTest.java | 2 +- .../enterprise/NetworkLogsPreferenceControllerTest.java | 2 +- .../enterprise/SecurityLogsPreferenceControllerTest.java | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java index 111e503def9..24a96b17b7f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java @@ -31,7 +31,7 @@ import static com.google.common.truth.Truth.assertThat; * Tests for {@link AdminActionPreferenceControllerBase}. */ @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 AdminActionPreferenceControllerBaseTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java index 1154aa7bbe3..b003ad8b32d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AdminGrantedCameraPermissionPreferenceController}. */ @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 AdminGrantedCameraPermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java index 1c30da167fa..2fb3e219441 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}. */ @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 AdminGrantedLocationPermissionsPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java index 624022b90ed..9ee81002e66 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}. */ @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 AdminGrantedMicrophonePermissionPreferenceControllerTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java index a5d1d1a855d..918c5fbae12 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java @@ -26,7 +26,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}. */ @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 AdminGrantedPermissionsPreferenceControllerBaseTest extends AdminGrantedPermissionsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index 365b9beb662..17649bb4217 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}. */ @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 AlwaysOnVpnCurrentUserPreferenceControllerTest { private static final String VPN_SET_DEVICE = "VPN set"; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index 5f921cd9b5a..d54505b2dff 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; * Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}. */ @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 AlwaysOnVpnManagedProfilePreferenceControllerTest { private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 80d4aafa46a..fce271968b5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -46,7 +46,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 ApplicationListFragmentTest { private static final int USER_ID = 0; private static final int USER_APP_UID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index 0b97353f7d7..cc1de2712ce 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; * Tests for {@link BugReportsPreferenceController}. */ @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 BugReportsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 5ee1145952c..c933d18dcb5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -35,7 +35,7 @@ import org.robolectric.annotation.Config; * Tests for {@link CaCertsCurrentUserPreferenceController}. */ @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 CaCertsCurrentUserPreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java index 2aa5306d543..d246488a27f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link CaCertsManagedProfilePreferenceController}. */ @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 CaCertsManagedProfilePreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java index ec76b2b4b7a..7a6bc88a0f9 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link CaCertsPreferenceControllerBase}. */ @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase { private static final String PREF_KEY = "pref"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index b4f7827646d..7ecd0e300f5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -45,7 +45,7 @@ import org.robolectric.annotation.Config; * Tests for {@link EnterpriseInstalledPackagesPreferenceController}. */ @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 EnterpriseInstalledPackagesPreferenceControllerTest { private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 1ea2567b58f..516ccb5d7fc 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -57,7 +57,7 @@ import static org.mockito.Mockito.when; * Tests for {@link EnterprisePrivacyFeatureProviderImpl}. */ @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 EnterprisePrivacyFeatureProviderImplTest { private final ComponentName OWNER = new ComponentName("dummy", "component"); diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 18f16f458d8..dd97cc0964a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; * Tests for {@link EnterprisePrivacyPreferenceController}. */ @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 EnterprisePrivacyPreferenceControllerTest { private static final String MANAGED_GENERIC = "managed by organization"; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index a2b539dcb71..1a37e63dd16 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -44,7 +44,7 @@ import java.util.List; * Tests for {@link EnterprisePrivacySettings}. */ @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 EnterprisePrivacySettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 567c06f7a74..c47a0ace70c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -42,7 +42,7 @@ import org.robolectric.shadows.ShadowApplication; 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 EnterpriseSetDefaultAppsListFragmentTest { @Mock(answer = RETURNS_DEEP_STUBS) private PreferenceScreen mScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index c38f56a46b7..cf669674b18 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.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 EnterpriseSetDefaultAppsListPreferenceControllerTest { private static final int USER_ID = 0; private static final int APP_UID = 0; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 9eb6d664541..122355899a0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -52,7 +52,7 @@ import java.util.List; * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}. */ @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 EnterpriseSetDefaultAppsPreferenceControllerTest { private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps"; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java index 8453d621003..77d6ea00106 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}. */ @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 FailedPasswordWipeCurrentUserPreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java index a001a9cc8e7..c88c22b31a6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java @@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}. */ @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 FailedPasswordWipeManagedProfilePreferenceControllerTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java index f80667c676d..ecc490f583d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java @@ -26,7 +26,7 @@ import org.robolectric.annotation.Config; * Tests for {@link FailedPasswordWipePreferenceControllerBase}. */ @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 FailedPasswordWipePreferenceControllerBaseTest extends FailedPasswordWipePreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index b9c24bff0c4..e31b40f7509 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; * Tests for {@link GlobalHttpProxyPreferenceController}. */ @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 GlobalHttpProxyPreferenceControllerTest { private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index 1e053833999..caa512156b3 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; * Tests for {@link ImePreferenceController}. */ @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 ImePreferenceControllerTest { private static final String DEFAULT_IME_LABEL = "Test IME"; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index 2df05c211c1..f46ecce2b10 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; * Tests for {@link ManageDeviceAdminPreferenceController}. */ @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 ManageDeviceAdminPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 43b793d86d3..e8f7398f734 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; * Tests for {@link NetworkLogsPreferenceController}. */ @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 NetworkLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 11e219a3efc..7a597dc3500 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; * Tests for {@link SecurityLogsPreferenceController}. */ @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 SecurityLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase {