From 651edc5c440d27d5ca26ee17a1a3daf0d479041e Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Thu, 12 Mar 2020 19:17:39 +0800 Subject: [PATCH] Remove ignore test case Fixes: 147865441 Test: RunSettingsRoboTests ROBOTEST_FILTER=AssistFlashScreenPreferenceControllerTest RunSettingsRoboTests ROBOTEST_FILTER=DefaultAssistPreferenceControllerTest RunSettingsRoboTests ROBOTEST_FILTER=DefaultAutofillPickerTest RunSettingsRoboTests ROBOTEST_FILTER=StyleSuggestionActivityTest Change-Id: I46f2d4b1dc38047bea3b287f11dcc71b7aed6c87 --- .../assist/AssistFlashScreenPreferenceControllerTest.java | 4 ---- .../assist/DefaultAssistPreferenceControllerTest.java | 2 -- .../applications/defaultapps/DefaultAutofillPickerTest.java | 2 -- .../settings/wallpaper/StyleSuggestionActivityTest.java | 3 --- 4 files changed, 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index 8392ac140a9..1e6faa16b98 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -41,7 +41,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -81,7 +80,6 @@ public class AssistFlashScreenPreferenceControllerTest { } @Test - @Ignore @Config(shadows = {ShadowSecureSettings.class}) public void isAvailable_hasAssistantAndAllowDisclosure_shouldReturnTrue() { ReflectionHelpers.setField(mController, "mContext", mMockContext); @@ -93,7 +91,6 @@ public class AssistFlashScreenPreferenceControllerTest { } @Test - @Ignore @Config(shadows = {ShadowSecureSettings.class}) public void isAvailable_hasAssistantAndDisallowDisclosure_shouldReturnTrue() { ReflectionHelpers.setField(mController, "mContext", mMockContext); @@ -112,7 +109,6 @@ public class AssistFlashScreenPreferenceControllerTest { } @Test - @Ignore @Config(shadows = {ShadowSecureSettings.class}) public void onResume_shouldUpdatePreference() { Settings.Secure.putString(mContext.getContentResolver(), diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 7de830ca598..3e46027c362 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -44,7 +44,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -95,7 +94,6 @@ public class DefaultAssistPreferenceControllerTest { } @Test - @Ignore @Config(shadows = {ShadowSecureSettings.class}) public void getDefaultAppInfo_hasDefaultAssist_shouldReturnKey() { final String flattenKey = "com.android.settings/assist"; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index dfacd81f02c..9ec7f0b550a 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -45,7 +45,6 @@ import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.applications.DefaultAppInfo; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -107,7 +106,6 @@ public class DefaultAutofillPickerTest { } @Test - @Ignore public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() { mPicker.onAttach((Context) mActivity); diff --git a/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java index 72f9c624a04..120c780ab9d 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/StyleSuggestionActivityTest.java @@ -28,7 +28,6 @@ import android.provider.Settings; import com.android.settings.testutils.shadow.ShadowSecureSettings; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -61,7 +60,6 @@ public class StyleSuggestionActivityTest { } @Test - @Ignore @Config(shadows = ShadowSecureSettings.class) public void hasStyleSet_yes_shouldReturnTrue() { when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService)) @@ -73,7 +71,6 @@ public class StyleSuggestionActivityTest { } @Test - @Ignore @Config(shadows = ShadowSecureSettings.class) public void hasStyleSet_no_shouldReturnFalse() { when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))