From 99fb1065fa4500aa18124bde0ecc37a403ae0756 Mon Sep 17 00:00:00 2001
From: Allen Su <allenwtsu@google.com>
Date: Mon, 11 Mar 2024 07:16:19 +0000
Subject: [PATCH] Fix Locale unit test failure

Bug: 301380610
Bug: 313604701
Test: atest LocalePickerActivityTest
Change-Id: Icab8eeea62c7c40c160d745afd08f71fcca5ec9c
---
 .../settings/localepicker/AppLocalePickerActivityTest.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java b/tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java
index 2989324701f..58ce1b2d028 100644
--- a/tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java
+++ b/tests/robotests/src/com/android/settings/localepicker/AppLocalePickerActivityTest.java
@@ -58,7 +58,6 @@ import com.android.settings.testutils.FakeFeatureFactory;
 
 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;
@@ -203,7 +202,6 @@ public class AppLocalePickerActivityTest {
         assertThat(controller.get().isFinishing()).isTrue();
     }
 
-    @Ignore("b/313604701")
     @Test
     public void onLocaleSelected_getLocaleNotNull_getLanguageTag() {
         ActivityController<TestAppLocalePickerActivity> controller =
@@ -216,7 +214,10 @@ public class AppLocalePickerActivityTest {
         AppLocalePickerActivity mActivity = controller.get();
         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(controller.get().isFinishing()).isTrue();
     }