PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all LooperMode.LEGACY usages from settings/accessibility

Browse Source 
Bug: 331124680

Test: atest
Change-Id: I21cc137358e5cb29c16aeda0b744f36d9f8bf010
This commit is contained in:
Fan Wu
2024-03-22 15:13:25 +08:00
parent 8735770fa8
commit c788a90669
7 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java
View File

@@ -54,11 +54,10 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper;
/** Tests for {@link AccessibilityGestureNavigationTutorial}. */
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public final class AccessibilityGestureNavigationTutorialTest {
@Rule
@@ -178,6 +177,7 @@ public final class AccessibilityGestureNavigationTutorialTest {
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes);
alertDialog.show();
ShadowLooper.idleMainLooper();
assertThat(alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE).getVisibility())
.isEqualTo(View.GONE);
@@ -204,6 +204,7 @@ public final class AccessibilityGestureNavigationTutorialTest {
alertDialog.show();
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(alertDialog.isShowing()).isFalse();
}
@@ -216,6 +217,7 @@ public final class AccessibilityGestureNavigationTutorialTest {
alertDialog.show();
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
verify(mOnClickListener).onClick(alertDialog, DialogInterface.BUTTON_POSITIVE);
}
@@ -228,6 +230,7 @@ public final class AccessibilityGestureNavigationTutorialTest {
alertDialog.show();
alertDialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
ShadowLooper.idleMainLooper();
final Intent intent = shadowOf(activity).peekNextStartedActivity();
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
@@ -243,6 +246,7 @@ public final class AccessibilityGestureNavigationTutorialTest {
showGestureNavigationTutorialDialog(mContext, mOnDismissListener);
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(alertDialog.isShowing()).isFalse();
verify(mOnDismissListener).onDismiss(alertDialog);

4
tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java
View File

@@ -53,15 +53,14 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLooper;
/**
* Tests for {@link AccessibilityQuickSettingsPrimarySwitchPreferenceController}.
*/
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest {
private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
@@ -160,6 +159,7 @@ public class AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest {
mController.onCreate(savedInstanceState);
mController.displayPreference(mScreen);
ShadowLooper.idleMainLooper();
assertThat(getLatestPopupWindow().isShowing()).isTrue();
}

5
tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java
View File

@@ -44,11 +44,10 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper;
/** Tests for {@link HearingAidDialogFragment}. */
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
ShadowAlertDialogCompat.class,
@@ -81,6 +80,7 @@ public class HearingAidDialogFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
final Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
@@ -93,6 +93,7 @@ public class HearingAidDialogFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(dialog.isShowing()).isFalse();
}

6
tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java
View File

@@ -60,12 +60,11 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowLooper;
/** Tests for {@link HearingAidPairingDialogFragment}. */
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowAlertDialogCompat.class,
com.android.settings.testutils.shadow.ShadowBluetoothAdapter.class,
@@ -122,6 +121,7 @@ public class HearingAidPairingDialogFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
final Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
@@ -135,6 +135,7 @@ public class HearingAidPairingDialogFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
final Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
@@ -147,6 +148,7 @@ public class HearingAidPairingDialogFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_NEGATIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(dialog.isShowing()).isFalse();
}

7
tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
View File

@@ -61,15 +61,14 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLooper;
/**
* Tests for {@link PreviewSizeSeekBarController}.
*/
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {ShadowInteractionJankMonitor.class})
public class PreviewSizeSeekBarControllerTest {
@@ -194,8 +193,9 @@ public class PreviewSizeSeekBarControllerTest {
mSeekBarPreference.setProgress(mSeekBarPreference.getMax());
mSeekBarPreference.onProgressChanged(new SeekBar(mContext), /* progress= */
0, /* fromUser= */ false);
ShadowLooper.idleMainLooper();
verify(mInteractionListener).notifyPreferenceChanged();
verify(mInteractionListener).onProgressChanged();
}
@Test
@@ -259,6 +259,7 @@ public class PreviewSizeSeekBarControllerTest {
mSeekBarController.onCreate(savedInstanceState);
mSeekBarController.displayPreference(mPreferenceScreen);
ShadowLooper.idleMainLooper();
assertThat(getLatestPopupWindow().isShowing()).isTrue();
}

6
tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentTest.java
View File

@@ -52,7 +52,7 @@ import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.ShadowLooper;
import org.robolectric.shadows.ShadowToast;
import java.util.ArrayList;
@@ -61,7 +61,6 @@ import java.util.List;
/** Tests for {@link TextReadingPreferenceFragment}. */
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
@@ -98,6 +97,7 @@ public class TextReadingPreferenceFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick();
ShadowLooper.idleMainLooper();
assertThat(mFragment.mNeedResetSettings).isTrue();
}
@@ -112,6 +112,7 @@ public class TextReadingPreferenceFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick();
ShadowLooper.idleMainLooper();
verify(listener1).resetState();
verify(listener2).resetState();
@@ -126,6 +127,7 @@ public class TextReadingPreferenceFragmentTest {
dialog.show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick();
ShadowLooper.idleMainLooper();
assertThat(ShadowToast.getTextOfLatestToast())
.isEqualTo(mContext.getString(R.string.accessibility_text_reading_reset_message));

4
tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
View File

@@ -74,15 +74,14 @@ import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLooper;
import java.util.Locale;
/** Tests for {@link ToggleFeaturePreferenceFragment} */
@RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {
ShadowFragment.class,
})
@@ -252,6 +251,7 @@ public class ToggleFeaturePreferenceFragmentTest {
final CheckBox hardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
hardwareTypeCheckBox.setChecked(true);
dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick();
ShadowLooper.idleMainLooper();
final boolean skipTimeoutRestriction = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.SKIP_ACCESSIBILITY_SHORTCUT_DIALOG_TIMEOUT_RESTRICTION, 0) != 0;