Move enterprise test package to sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I6b4c5d1d2ba9e7f48168c545432a5a62d024f43d
This commit is contained in:
jeffreyhuang
2017-11-28 14:50:02 -08:00
parent 9c8fe7e78a
commit e155871920
27 changed files with 27 additions and 27 deletions

View File

@@ -31,7 +31,7 @@ import static com.google.common.truth.Truth.assertThat;
* Tests for {@link AdminActionPreferenceControllerBase}. * Tests for {@link AdminActionPreferenceControllerBase}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class AdminActionPreferenceControllerBaseTest extends
AdminActionPreferenceControllerTestBase { AdminActionPreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AdminGrantedCameraPermissionPreferenceController}. * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class AdminGrantedCameraPermissionPreferenceControllerTest extends
AdminGrantedPermissionsPreferenceControllerTestBase { AdminGrantedPermissionsPreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AdminGrantedLocationPermissionsPreferenceController}. * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends
AdminGrantedPermissionsPreferenceControllerTestBase { AdminGrantedPermissionsPreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}. * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends
AdminGrantedPermissionsPreferenceControllerTestBase { AdminGrantedPermissionsPreferenceControllerTestBase {

View File

@@ -26,7 +26,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}. * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends
AdminGrantedPermissionsPreferenceControllerTestBase { AdminGrantedPermissionsPreferenceControllerTestBase {

View File

@@ -39,7 +39,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}. * Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
private static final String VPN_SET_DEVICE = "VPN set"; private static final String VPN_SET_DEVICE = "VPN set";

View File

@@ -38,7 +38,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}. * Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile"; private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";

View File

@@ -46,7 +46,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class ApplicationListFragmentTest {
private static final int USER_ID = 0; private static final int USER_ID = 0;
private static final int USER_APP_UID = 0; private static final int USER_APP_UID = 0;

View File

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link BugReportsPreferenceController}. * Tests for {@link BugReportsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class BugReportsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase { AdminActionPreferenceControllerTestBase {

View File

@@ -35,7 +35,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link CaCertsCurrentUserPreferenceController}. * Tests for {@link CaCertsCurrentUserPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class CaCertsCurrentUserPreferenceControllerTest extends
CaCertsPreferenceControllerTestBase { CaCertsPreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link CaCertsManagedProfilePreferenceController}. * Tests for {@link CaCertsManagedProfilePreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class CaCertsManagedProfilePreferenceControllerTest extends
CaCertsPreferenceControllerTestBase { CaCertsPreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link CaCertsPreferenceControllerBase}. * Tests for {@link CaCertsPreferenceControllerBase}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
private static final String PREF_KEY = "pref"; private static final String PREF_KEY = "pref";

View File

@@ -45,7 +45,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link EnterpriseInstalledPackagesPreferenceController}. * Tests for {@link EnterpriseInstalledPackagesPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class EnterpriseInstalledPackagesPreferenceControllerTest {
private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES

View File

@@ -57,7 +57,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link EnterprisePrivacyFeatureProviderImpl}. * Tests for {@link EnterprisePrivacyFeatureProviderImpl}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class EnterprisePrivacyFeatureProviderImplTest {
private final ComponentName OWNER = new ComponentName("dummy", "component"); private final ComponentName OWNER = new ComponentName("dummy", "component");

View File

@@ -39,7 +39,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link EnterprisePrivacyPreferenceController}. * Tests for {@link EnterprisePrivacyPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class EnterprisePrivacyPreferenceControllerTest {
private static final String MANAGED_GENERIC = "managed by organization"; private static final String MANAGED_GENERIC = "managed by organization";

View File

@@ -44,7 +44,7 @@ import java.util.List;
* Tests for {@link EnterprisePrivacySettings}. * Tests for {@link EnterprisePrivacySettings}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class EnterprisePrivacySettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)

View File

@@ -42,7 +42,7 @@ import org.robolectric.shadows.ShadowApplication;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class EnterpriseSetDefaultAppsListFragmentTest {
@Mock(answer = RETURNS_DEEP_STUBS) @Mock(answer = RETURNS_DEEP_STUBS)
private PreferenceScreen mScreen; private PreferenceScreen mScreen;

View File

@@ -59,7 +59,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class) @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 { public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
private static final int USER_ID = 0; private static final int USER_ID = 0;
private static final int APP_UID = 0; private static final int APP_UID = 0;

View File

@@ -52,7 +52,7 @@ import java.util.List;
* Tests for {@link EnterpriseSetDefaultAppsPreferenceController}. * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps"; private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}. * Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class FailedPasswordWipeCurrentUserPreferenceControllerTest extends
FailedPasswordWipePreferenceControllerTestBase { FailedPasswordWipePreferenceControllerTestBase {

View File

@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}. * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends
FailedPasswordWipePreferenceControllerTestBase { FailedPasswordWipePreferenceControllerTestBase {

View File

@@ -26,7 +26,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link FailedPasswordWipePreferenceControllerBase}. * Tests for {@link FailedPasswordWipePreferenceControllerBase}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class FailedPasswordWipePreferenceControllerBaseTest extends
FailedPasswordWipePreferenceControllerTestBase { FailedPasswordWipePreferenceControllerTestBase {

View File

@@ -38,7 +38,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link GlobalHttpProxyPreferenceController}. * Tests for {@link GlobalHttpProxyPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class GlobalHttpProxyPreferenceControllerTest {
private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy"; private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";

View File

@@ -39,7 +39,7 @@ import org.robolectric.annotation.Config;
* Tests for {@link ImePreferenceController}. * Tests for {@link ImePreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class ImePreferenceControllerTest {
private static final String DEFAULT_IME_LABEL = "Test IME"; private static final String DEFAULT_IME_LABEL = "Test IME";

View File

@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link ManageDeviceAdminPreferenceController}. * Tests for {@link ManageDeviceAdminPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 { public final class ManageDeviceAdminPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)

View File

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link NetworkLogsPreferenceController}. * Tests for {@link NetworkLogsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class NetworkLogsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase { AdminActionPreferenceControllerTestBase {

View File

@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
* Tests for {@link SecurityLogsPreferenceController}. * Tests for {@link SecurityLogsPreferenceController}.
*/ */
@RunWith(SettingsRobolectricTestRunner.class) @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 public final class SecurityLogsPreferenceControllerTest extends
AdminActionPreferenceControllerTestBase { AdminActionPreferenceControllerTestBase {