diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java index 91e4ececb2c..10514835822 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java @@ -39,7 +39,6 @@ import com.android.settings.testutils.XmlTestUtils; import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,7 +52,6 @@ import org.robolectric.annotation.Config; import java.util.List; /** Tests for {@link AccessibilityButtonFragment}. */ -@Ignore @Config(shadows = ShadowFragment.class) @RunWith(RobolectricTestRunner.class) public class AccessibilityButtonFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java index c68e90bdc17..0886fc281a3 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java @@ -51,7 +51,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -246,7 +245,6 @@ public class AccessibilityHearingAidPreferenceControllerTest { mContext.getText(R.string.accessibility_hearingaid_not_connected_summary)); } - @Ignore @Test public void handleHearingAidPreferenceClick_noHearingAid_launchHearingAidInstructionDialog() { mPreferenceController = spy(new AccessibilityHearingAidPreferenceController(mContext, @@ -258,7 +256,6 @@ public class AccessibilityHearingAidPreferenceControllerTest { verify(mPreferenceController).launchHearingAidInstructionDialog(); } - @Ignore @Test public void handleHearingAidPreferenceClick_withHearingAid_launchBluetoothDeviceDetailSetting () { diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index c4609d61ce7..a2aea6b01a2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -65,7 +65,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.SearchIndexableRaw; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -153,7 +152,6 @@ public class AccessibilitySettingsTest { } @Test - @Ignore public void getRawDataToIndex_isNull() { final List indexableRawList = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true); @@ -257,7 +255,6 @@ public class AccessibilitySettingsTest { assertThat(description).isEqualTo(DEFAULT_DESCRIPTION); } - @Ignore @Test @Config(shadows = {ShadowFragment.class, ShadowUserManager.class}) public void onCreate_haveRegisterToSpecificUrisAndActions() { @@ -281,7 +278,6 @@ public class AccessibilitySettingsTest { assertThat(intentFilter.hasAction(Intent.ACTION_PACKAGE_REMOVED)).isTrue(); } - @Ignore @Test @Config(shadows = {ShadowFragment.class, ShadowUserManager.class}) public void onDestroy_unregisterObserverAndReceiver() { @@ -297,7 +293,6 @@ public class AccessibilitySettingsTest { } - @Ignore @Test @Config(shadows = {ShadowFragment.class, ShadowUserManager.class}) public void onContentChanged_updatePreferenceInForeground_preferenceUpdated() { @@ -314,7 +309,6 @@ public class AccessibilitySettingsTest { } - @Ignore @Test @Config(shadows = {ShadowFragment.class, ShadowUserManager.class}) public void onContentChanged_updatePreferenceInBackground_preferenceUpdated() { diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java index 97ca10a468c..7fbc3e36278 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java @@ -50,7 +50,6 @@ import com.android.settings.R; import com.android.settings.testutils.shadow.ShadowFragment; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -63,7 +62,6 @@ import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; /** Tests for {@link AccessibilityShortcutPreferenceFragment} */ -@Ignore @RunWith(RobolectricTestRunner.class) public class AccessibilityShortcutPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/DisplaySizeDataTest.java b/tests/robotests/src/com/android/settings/accessibility/DisplaySizeDataTest.java index fabf1233c49..007659ce1f5 100644 --- a/tests/robotests/src/com/android/settings/accessibility/DisplaySizeDataTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/DisplaySizeDataTest.java @@ -23,7 +23,6 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -41,7 +40,6 @@ public class DisplaySizeDataTest { mDisplaySizeData = new DisplaySizeData(mContext); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test public void commit_success() { final int progress = 4; diff --git a/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java index 0280fae6b6d..a063a9f45c2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragmentTest.java @@ -30,7 +30,6 @@ import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -66,7 +65,6 @@ public class FlashNotificationsPreferenceFragmentTest { assertThat(mFragment.getLogTag()).isEqualTo("FlashNotificationsPreferenceFragment"); } - @Ignore @Test public void getMetricsCategory_isZero() { assertThat(mFragment.getMetricsCategory()).isEqualTo(0); // TODO diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index 8c2be5299e3..e4faaaad0cc 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.widget.SeekBarPreference; 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.Mock; @@ -159,7 +158,6 @@ public class HapticFeedbackIntensityPreferenceControllerTest { } @Test - @Ignore public void setProgress_updatesIntensityAndDependentSettings() throws Exception { mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF); assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY)) diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackTogglePreferenceControllerTest.java index 77aede2d38b..b87e9cf7800 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackTogglePreferenceControllerTest.java @@ -35,7 +35,6 @@ import com.android.settings.core.BasePreferenceController; 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.Mock; @@ -152,7 +151,6 @@ public class HapticFeedbackTogglePreferenceControllerTest { } @Test - @Ignore public void setChecked_updatesIntensityAndDependentSettings() throws Exception { updateSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index 0638af98b5d..a9bd2d06bad 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.widget.SeekBarPreference; 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.Mock; @@ -147,7 +146,6 @@ public class NotificationVibrationIntensityPreferenceControllerTest { @Test - @Ignore public void setProgress_updatesIntensitySetting() throws Exception { mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF); assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY)) diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java index 4b6f686fa1b..28244e5106d 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationTogglePreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.core.BasePreferenceController; 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.Mock; @@ -138,7 +137,6 @@ public class NotificationVibrationTogglePreferenceControllerTest { } @Test - @Ignore public void setChecked_updatesIntensityAndDependentSettings() throws Exception { updateSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF); diff --git a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java index 2ff5d71a4f3..67f643ac30c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.widget.SeekBarPreference; 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.Mock; @@ -167,7 +166,6 @@ public class RingVibrationIntensityPreferenceControllerTest { } @Test - @Ignore public void setProgress_updatesIntensityAndDependentSettings() throws Exception { mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF); assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY)) diff --git a/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java index 865c29003da..06a6a9c7fcc 100644 --- a/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java @@ -36,7 +36,6 @@ import com.android.settings.core.BasePreferenceController; 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.Mock; @@ -161,7 +160,6 @@ public class RingVibrationTogglePreferenceControllerTest { } @Test - @Ignore public void setChecked_updatesIntensityAndDependentSettings() throws Exception { updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF); mController.updateState(mPreference); diff --git a/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java index 19089c9862d..dab13a0e886 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ScreenFlashNotificationColorDialogFragmentTest.java @@ -44,7 +44,6 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; @@ -54,7 +53,6 @@ import org.robolectric.shadows.ShadowContextWrapper; import java.util.ArrayList; import java.util.List; -@Ignore @RunWith(RobolectricTestRunner.class) public class ScreenFlashNotificationColorDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java index 76f89bb45c8..0e67b17bdca 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java @@ -43,7 +43,6 @@ import com.android.settings.testutils.XmlTestUtils; import com.android.settings.utils.ActivityControllerWrapper; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -141,7 +140,6 @@ public class TextReadingPreferenceFragmentTest { R.xml.accessibility_text_reading_options); } - @Ignore @Test public void getLogTag_returnsCorrectTag() { assertThat(mFragment.getLogTag()).isEqualTo("TextReadingPreferenceFragment"); diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index 9e7ae5d9909..4f82649e21c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -54,7 +54,6 @@ import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settingslib.widget.TopIntroPreference; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -119,7 +118,6 @@ public class ToggleFeaturePreferenceFragmentTest { mContext.setTheme(R.style.Theme_AppCompat); } - @Ignore @Test public void setupFragment_getExpectedPreferenceScreenResId() { FragmentController.setupFragment(mFragment, FragmentActivity.class, diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java index 9916dc9d7f4..d2dfae06bef 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java @@ -63,7 +63,6 @@ import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment; 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.Mock; @@ -121,7 +120,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { when(mActivity.getContentResolver()).thenReturn(mContentResolver); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test @Config(shadows = ShadowFragment.class) public void onResume_defaultStateForFollowingTyping_switchPreferenceShouldReturnTrue() { @@ -137,7 +135,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat(switchPreference.isChecked()).isTrue(); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test @Config(shadows = ShadowFragment.class) public void onResume_disableFollowingTyping_switchPreferenceShouldReturnFalse() { @@ -343,7 +340,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test public void onCreateView_magnificationAreaNotSupported_settingsPreferenceIsNull() { when(mResources.getBoolean( @@ -357,7 +353,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat(mFragment.mSettingsPreference).isNull(); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test public void onCreateView_windowMagnificationNotSupported_settingsPreferenceIsNull() { when(mResources.getBoolean( @@ -371,7 +366,6 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat(mFragment.mSettingsPreference).isNull(); } - @Ignore("Ignore it since a NPE is happened in ShadowWindowManagerGlobal. (Ref. b/214161063)") @Test public void onCreateView_setDialogDelegateAndAddTheControllerToLifeCycleObserver() { Lifecycle lifecycle = mock(Lifecycle.class); diff --git a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java index cfb459c6f90..3acc02c4c18 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -48,7 +47,6 @@ public class TopLevelAccessibilityPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Ignore @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_unsupportedWhenSet() { diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceControllerTest.java index 9e3113053cc..95c3e1560d2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationRampingRingerTogglePreferenceControllerTest.java @@ -40,7 +40,6 @@ import androidx.test.core.app.ApplicationProvider; 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.Mock; @@ -86,7 +85,6 @@ public class VibrationRampingRingerTogglePreferenceControllerTest { } @Test - @Ignore public void getAvailabilityStatus_notVoiceCapable_returnUnsupportedOnDevice() { when(mTelephonyManager.isVoiceCapable()).thenReturn(false); when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(false); @@ -95,7 +93,6 @@ public class VibrationRampingRingerTogglePreferenceControllerTest { } @Test - @Ignore public void getAvailabilityStatus_rampingRingerEnabled_returnUnsupportedOnDevice() { when(mTelephonyManager.isVoiceCapable()).thenReturn(true); when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(true); @@ -104,7 +101,6 @@ public class VibrationRampingRingerTogglePreferenceControllerTest { } @Test - @Ignore public void getAvailabilityStatus_voiceCapableAndRampingRingerDisabled_returnAvailable() { when(mTelephonyManager.isVoiceCapable()).thenReturn(true); when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(false); @@ -146,7 +142,6 @@ public class VibrationRampingRingerTogglePreferenceControllerTest { } @Test - @Ignore public void setChecked_withRingEnabled_updatesSetting() { updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);