From 7d6a96e4ffe7d0faab55a35741ce38792953291f Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 1 Dec 2017 15:04:12 -0800 Subject: [PATCH] move support test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: Ief5bfdd024a8c40255c759182df01fc41ca57f90 --- .../settings/support/NewDeviceIntroSuggestionActivityTest.java | 2 +- .../src/com/android/settings/support/SupportConfigTest.java | 2 +- .../android/settings/support/SupportDashboardActivityTest.java | 2 +- .../settings/support/SupportDisclaimerDialogFragmentTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java index 5ad8500a7e7..19d6aa9f43a 100644 --- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java @@ -52,7 +52,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class NewDeviceIntroSuggestionActivityTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java index 28b0a9df1d0..ae4fcff6f7e 100644 --- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java @@ -28,7 +28,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 SupportConfigTest { @Test diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java index 178e4ec7e5f..e7de81c7557 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java @@ -40,7 +40,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 SupportDashboardActivityTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java index 31c654c6f48..cc025fbbed6 100644 --- a/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/support/SupportDisclaimerDialogFragmentTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.directlyOn; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {SupportDisclaimerShadowResources.class}) public class SupportDisclaimerDialogFragmentTest {