From feaa82ce8fcf4da827a2204e5a9bbb6393035b6d Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 2 Oct 2017 13:10:08 -0700 Subject: [PATCH] Make robotest less flaky Change-Id: Ic9ed1ccbb7b7f802b6a5cf915aeb96c799007a7d Fixes: 67307841 Test: rerun robotest --- .../DevelopmentSettingsDashboardFragmentTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index 2787fc1b11a..7a48120e870 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -51,11 +50,7 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = { - SettingsShadowResources.class, - SettingsShadowResources.SettingsShadowTheme.class - }) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class DevelopmentSettingsDashboardFragmentTest { private SwitchBar mSwitchBar; @@ -100,6 +95,10 @@ public class DevelopmentSettingsDashboardFragmentTest { } @Test + @Config(shadows = { + SettingsShadowResources.class, + SettingsShadowResources.SettingsShadowTheme.class + }) public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() { final Context appContext = RuntimeEnvironment.application; DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false);