Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20f85c52 authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Remove all LooperMode.LEGACY usages from settings/accessibility" into main

parents 2625ca4e c788a906

tests/robotests/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorialTest.java

+6 −2
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }

tests/robotests/src/com/android/settings/accessibility/HearingAidDialogFragmentTest.java

+3 −2
Original line number Diff line number Diff line
@@ -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();

    }

tests/robotests/src/com/android/settings/accessibility/HearingAidPairingDialogFragmentTest.java

+4 −2
Original line number Diff line number Diff line
@@ -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();

    }

tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -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();

    }