From 0fccd4d49e1582b90b0ad8c87fb14cb317d849f1 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Mon, 27 Nov 2017 17:09:51 -0800 Subject: [PATCH] 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)