From 3074f25b9f289f7a0708e82780d196f19ba7da4a Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 1 Dec 2017 15:10:04 -0800 Subject: [PATCH] move survey and system test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I6090a4d1e8b5b094c2400c8f6088953c2cf5b2f6 --- .../src/com/android/settings/survey/SurveyMixinTest.java | 2 +- .../settings/system/FactoryResetPreferenceControllerTest.java | 2 +- .../android/settings/system/SystemDashboardFragmentTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index 116b63ca58f..3dbd1e658b0 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -32,7 +32,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 SurveyMixinTest { private static final String FAKE_KEY = "fake_key"; diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java index b986e4f7f54..7ae6cdb6360 100644 --- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java @@ -39,7 +39,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = {ShadowSecureSettings.class, ShadowUtils.class} ) public class FactoryResetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java index cd2595300ce..8a1951a7c55 100644 --- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java @@ -41,7 +41,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, shadows = { ShadowUserManager.class, SettingsShadowResources.class,