From 04a025c59d09ea5c049376afbe6920a410176520 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 30 Nov 2017 15:38:39 -0800 Subject: [PATCH 1/2] Add resourceImpl shadow to tests for sdk 26 - Update ChooseLockPatternTest to sdk 26 - Update SetupChooseLockPasswordTest to sdk 26 - Update ChooseLockPasswordTest to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I453d835992eee01f8b5c0c71ebb95fa28f51d4c4 --- .../com/android/settings/password/ChooseLockPasswordTest.java | 4 +++- .../com/android/settings/password/ChooseLockPatternTest.java | 4 +++- .../settings/password/SetupChooseLockPasswordTest.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index b8f06793ac3..12c6b99dd14 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -31,6 +31,7 @@ import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragme import com.android.settings.password.ChooseLockPassword.IntentBuilder; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.setupwizardlib.GlifLayout; @@ -47,9 +48,10 @@ import org.robolectric.shadows.ShadowDrawable; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, + SettingsShadowResourcesImpl.class, SettingsShadowResources.SettingsShadowTheme.class, ShadowEventLogWriter.class, ShadowUtils.class diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index c74448b5dd9..da3a157343c 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -29,6 +29,7 @@ import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment import com.android.settings.password.ChooseLockPattern.IntentBuilder; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.setupwizardlib.GlifLayout; @@ -43,9 +44,10 @@ import org.robolectric.shadows.ShadowDrawable; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, + SettingsShadowResourcesImpl.class, SettingsShadowResources.SettingsShadowTheme.class, ShadowEventLogWriter.class, ShadowUtils.class diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 1195a2c2ecd..97fffd59ce7 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -34,6 +34,7 @@ import com.android.settings.password.ChooseLockPassword.IntentBuilder; import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; +import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settings.testutils.shadow.ShadowUtils; @@ -57,9 +58,10 @@ import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, + SettingsShadowResourcesImpl.class, SettingsShadowResources.SettingsShadowTheme.class, ShadowEventLogWriter.class, ShadowUtils.class From a442405a0e2f82ff4c8993f577c82eda196547e4 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 30 Nov 2017 15:43:42 -0800 Subject: [PATCH 2/2] Move password test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I37c5df89dc4236a7d225c4802bf4195f2fd943b7 --- .../settings/password/ChooseLockGenericControllerTest.java | 2 +- .../android/settings/password/ChooseLockSettingsHelperTest.java | 2 +- .../settings/password/ChooseLockTypeDialogFragmentTest.java | 2 +- .../com/android/settings/password/ConfirmCredentialTest.java | 2 +- .../src/com/android/settings/password/ScreenLockTypeTest.java | 2 +- .../android/settings/password/SetNewPasswordActivityTest.java | 2 +- .../android/settings/password/SetNewPasswordControllerTest.java | 2 +- .../src/com/android/settings/password/SetupSkipDialogTest.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 28b0264a347..5b86374e4e9 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -47,7 +47,7 @@ import java.util.regex.Pattern; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class }) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 20a05e3b2dc..55e60e5371e 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -33,7 +33,7 @@ import org.robolectric.shadows.ShadowActivity.IntentForResult; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { ShadowUserManager.class, ShadowUtils.class diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java index 0a0734f54c0..2d82e0e2e97 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java @@ -49,7 +49,7 @@ import org.robolectric.util.FragmentTestUtil; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { ShadowEventLogWriter.class, ShadowUserManager.class, diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java index d76968e8640..1568f198df2 100644 --- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java +++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java @@ -35,7 +35,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class, diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java index 8beefa8c194..f8792a84afa 100644 --- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java +++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java @@ -30,7 +30,7 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION) + sdk = TestConfig.SDK_VERSION_O) public class ScreenLockTypeTest { @Test diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index cb863a0863a..06086fc2061 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class SetNewPasswordActivityTest { private int mProvisioned; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index 52678fbab29..a3f17879484 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -57,7 +57,7 @@ import org.robolectric.annotation.Config; * Tests for {@link SetNewPasswordController}. */ @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 SetNewPasswordControllerTest { private static final int CURRENT_USER_ID = 101; private static final long FINGERPRINT_CHALLENGE = -9876512313131L; diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java index 0e6f28a5686..6cd42447dbc 100644 --- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java @@ -40,7 +40,7 @@ import org.robolectric.shadows.ShadowAlertDialog; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class,