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

Merge "Fix Locale unit test failure" into main

Browse Source
This commit is contained in:
Allen Su
2024-03-18 14:11:08 +00:00
committed by Android (Google) Code Review
parent aee3dd3fb3 99fb1065fa
commit 354a78e33b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java
View File

@@ -58,7 +58,6 @@ import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -203,7 +202,6 @@ public class AppLocalePickerActivityTest {
assertThat(controller.get().isFinishing()).isTrue(); assertThat(controller.get().isFinishing()).isTrue();
} }
@Ignore("b/313604701")
@Test @Test
public void onLocaleSelected_getLocaleNotNull_getLanguageTag() { public void onLocaleSelected_getLocaleNotNull_getLanguageTag() {
ActivityController<TestAppLocalePickerActivity> controller = ActivityController<TestAppLocalePickerActivity> controller =
@@ -216,7 +214,10 @@ public class AppLocalePickerActivityTest {
AppLocalePickerActivity mActivity = controller.get(); AppLocalePickerActivity mActivity = controller.get();
mActivity.onLocaleSelected(mLocaleInfo); mActivity.onLocaleSelected(mLocaleInfo);
verify(mLocaleInfo, times(2)).getLocale(); // 1st for getLocale()!= null
// 2nd for setAppDefaultLocale(getLocale())
// 3rd for broadcastAppLocaleChange()
verify(mLocaleInfo, times(3)).getLocale();
assertThat(mLocaleInfo.getLocale().toLanguageTag()).isEqualTo("en-US"); assertThat(mLocaleInfo.getLocale().toLanguageTag()).isEqualTo("en-US");
assertThat(controller.get().isFinishing()).isTrue(); assertThat(controller.get().isFinishing()).isTrue();
} }