Merge "[Panlingual] Improve UI can not show on at first."

tests/unit/src/com/android/settings/applications/AppLocaleUtilTest.java

@@ -20,27 +20,31 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(AndroidJUnit4.class)
 public class AppLocaleUtilTest {
     @Mock
@@ -48,15 +52,14 @@ public class AppLocaleUtilTest {
     @Mock
     private ActivityManager mActivityManager;
     @Mock
-    private AppEntry mEntry;
-    @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock
     private Resources mResources;
 
     private Context mContext;
     private String mDisallowedPackage = "com.disallowed.package";
-    private String mAallowedPackage = "com.allowed.package";
+    private String mAllowedPackage = "com.allowed.package";
+    private List<ResolveInfo> mListResolveInfo;
 
     @Before
     public void setUp() {
@@ -64,54 +67,43 @@ public class AppLocaleUtilTest {
         mContext = spy(ApplicationProvider.getApplicationContext());
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(ActivityManager.class)).thenReturn(mActivityManager);
-    }
-
-    @Test
-    public void isDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException {
-        setTestAppEntry(mAallowedPackage);
         setDisallowedPackageName(mDisallowedPackage);
-        setApplicationInfo(/*no platform key*/false);
-        mEntry.hasLauncherEntry = true;
-
-        assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry));
     }
 
     @Test
-    public void isDisplayLocaleUi_notShowUI_hasPlatformKey()
+    public void canDisplayLocaleUi_showUI() throws PackageManager.NameNotFoundException {
+        setApplicationInfo(/*no platform key*/ false);
+        setActivityInfo(mAllowedPackage);
+
+        assertTrue(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
+    }
+
+    @Test
+    public void canDisplayLocaleUi_notShowUI_hasPlatformKey()
             throws PackageManager.NameNotFoundException {
-        setTestAppEntry(mAallowedPackage);
-        setDisallowedPackageName(mDisallowedPackage);
-        setApplicationInfo(/*has platform key*/true);
-        mEntry.hasLauncherEntry = true;
+        setApplicationInfo(/*has platform key*/ true);
+        setActivityInfo(mAllowedPackage);
 
-        assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry));
+        assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
     }
 
     @Test
-    public void isDisplayLocaleUi_notShowUI_noLauncherEntry()
+    public void canDisplayLocaleUi_notShowUI_noLauncherEntry()
             throws PackageManager.NameNotFoundException {
-        setTestAppEntry(mAallowedPackage);
-        setDisallowedPackageName(mDisallowedPackage);
         setApplicationInfo(/*no platform key*/false);
-        mEntry.hasLauncherEntry = false;
+        setActivityInfo("");
 
-        assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry));
+        assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mAllowedPackage, mListResolveInfo));
     }
 
     @Test
-    public void isDisplayLocaleUi_notShowUI_matchDisallowedPackageList()
+    public void canDisplayLocaleUi_notShowUI_matchDisallowedPackageList()
             throws PackageManager.NameNotFoundException {
-        setTestAppEntry(mDisallowedPackage);
-        setDisallowedPackageName(mDisallowedPackage);
         setApplicationInfo(/*no platform key*/false);
-        mEntry.hasLauncherEntry = false;
+        setActivityInfo("");
 
-        assertFalse(AppLocaleUtil.canDisplayLocaleUi(mContext, mEntry));
-    }
-
-    private void setTestAppEntry(String packageName) {
-        mEntry.info = mApplicationInfo;
-        mApplicationInfo.packageName = packageName;
+        assertFalse(AppLocaleUtil
+                .canDisplayLocaleUi(mContext, mDisallowedPackage, mListResolveInfo));
     }
 
     private void setDisallowedPackageName(String packageName) {
@@ -132,4 +124,13 @@ public class AppLocaleUtilTest {
         when(mPackageManager.getPackageInfoAsUser(anyString(), anyInt(), anyInt())).thenReturn(
                 packageInfo);
     }
+
+    private void setActivityInfo(String packageName) {
+        ResolveInfo resolveInfo = mock(ResolveInfo.class);
+        ActivityInfo activityInfo = mock(ActivityInfo.class);
+        activityInfo.packageName = packageName;
+        resolveInfo.activityInfo = activityInfo;
+        mListResolveInfo = new ArrayList<>();
+        mListResolveInfo.add(resolveInfo);
+    }
 }