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

Remove LooperMode.LEGACY from settings/localepicker

Browse Source 
Bug: 333641139

Test: atest
Change-Id: Ib26635f88623ace2d70ffd221aa36cb8157f8f46
This commit is contained in:
Fan Wu
2024-04-10 04:48:00 +00:00
parent 6a59b93701
commit ff45be03b1
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/localepicker/LocaleDialogFragmentTest.java
View File

@@ -38,22 +38,26 @@ import com.android.internal.app.LocaleStore;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper;
import java.util.Locale; import java.util.Locale;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class}) @Config(shadows = {ShadowAlertDialogCompat.class})
@LooperMode(LooperMode.Mode.LEGACY)
public class LocaleDialogFragmentTest { public class LocaleDialogFragmentTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock @Mock
private OnBackInvokedDispatcher mOnBackInvokedDispatcher; private OnBackInvokedDispatcher mOnBackInvokedDispatcher;
@@ -62,8 +66,6 @@ public class LocaleDialogFragmentTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mActivity = Robolectric.setupActivity(FragmentActivity.class); mActivity = Robolectric.setupActivity(FragmentActivity.class);
mDialogFragment = LocaleDialogFragment.newInstance(); mDialogFragment = LocaleDialogFragment.newInstance();
LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.ENGLISH); LocaleStore.LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.ENGLISH);
@@ -75,6 +77,7 @@ public class LocaleDialogFragmentTest {
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.add(mDialogFragment, null); fragmentTransaction.add(mDialogFragment, null);
fragmentTransaction.commit(); fragmentTransaction.commit();
ShadowLooper.idleMainLooper();
} }
@Test @Test

22
tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
View File

@@ -57,6 +57,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import androidx.test.core.app.ApplicationProvider;
import com.android.internal.app.LocaleStore; import com.android.internal.app.LocaleStore;
import com.android.settings.R; import com.android.settings.R;
@@ -72,12 +73,12 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList; import java.util.ArrayList;
@@ -90,9 +91,11 @@ import java.util.Locale;
ShadowActivityManager.class, ShadowActivityManager.class,
com.android.settings.testutils.shadow.ShadowFragment.class, com.android.settings.testutils.shadow.ShadowFragment.class,
}) })
@LooperMode(LooperMode.Mode.LEGACY)
public class LocaleListEditorTest { public class LocaleListEditorTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final String ARG_DIALOG_TYPE = "arg_dialog_type"; private static final String ARG_DIALOG_TYPE = "arg_dialog_type";
private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default"; private static final String TAG_DIALOG_CONFIRM_SYSTEM_DEFAULT = "dialog_confirm_system_default";
private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale"; private static final String TAG_DIALOG_NOT_AVAILABLE = "dialog_not_available_locale";
@@ -147,8 +150,8 @@ public class LocaleListEditorTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); Context context = ApplicationProvider.getApplicationContext();
mContext = spy(RuntimeEnvironment.application); mContext = spy(context);
mLocaleListEditor = spy(new LocaleListEditor()); mLocaleListEditor = spy(new LocaleListEditor());
when(mLocaleListEditor.getContext()).thenReturn(mContext); when(mLocaleListEditor.getContext()).thenReturn(mContext);
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get()); mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
@@ -156,11 +159,11 @@ public class LocaleListEditorTest {
when(mLocaleListEditor.getNotificationController()).thenReturn( when(mLocaleListEditor.getNotificationController()).thenReturn(
mNotificationController); mNotificationController);
ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView", ReflectionHelpers.setField(mLocaleListEditor, "mEmptyTextView",
new TextView(RuntimeEnvironment.application)); new TextView(context));
ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager", ReflectionHelpers.setField(mLocaleListEditor, "mRestrictionsManager",
RuntimeEnvironment.application.getSystemService(Context.RESTRICTIONS_SERVICE)); context.getSystemService(Context.RESTRICTIONS_SERVICE));
ReflectionHelpers.setField(mLocaleListEditor, "mUserManager", ReflectionHelpers.setField(mLocaleListEditor, "mUserManager",
RuntimeEnvironment.application.getSystemService(Context.USER_SERVICE)); context.getSystemService(Context.USER_SERVICE));
ReflectionHelpers.setField(mLocaleListEditor, "mAdapter", mAdapter); ReflectionHelpers.setField(mLocaleListEditor, "mAdapter", mAdapter);
ReflectionHelpers.setField(mLocaleListEditor, "mAddLanguage", mAddLanguage); ReflectionHelpers.setField(mLocaleListEditor, "mAddLanguage", mAddLanguage);
ReflectionHelpers.setField(mLocaleListEditor, "mFragmentManager", mFragmentManager); ReflectionHelpers.setField(mLocaleListEditor, "mFragmentManager", mFragmentManager);
@@ -283,6 +286,7 @@ public class LocaleListEditorTest {
// click the remove button // click the remove button
dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick(); dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
ShadowLooper.idleMainLooper();
assertThat(dialog.isShowing()).isFalse(); assertThat(dialog.isShowing()).isFalse();