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

Commit 5128bb95 authored by Calvin Pan's avatar Calvin Pan
Browse files

Fix test case fail 

Bug: 259175720
Test: atest and get/set the API

Change-Id: I52c316ddcfabd98d839bd7c4d1bac358b9f44a1e
parent a50fde10

services/tests/servicestests/src/com/android/server/locales/FakePackageConfigurationUpdater.java

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.locales;



import static android.content.res.Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED;



import android.annotation.Nullable;

import android.os.LocaleList;
@@ -29,6 +31,8 @@ class FakePackageConfigurationUpdater implements PackageConfigurationUpdater { 


    FakePackageConfigurationUpdater() {}



    private int mGender = GRAMMATICAL_GENDER_NOT_SPECIFIED;



    LocaleList mLocales = null;



    @Override
@@ -42,6 +46,12 @@ class FakePackageConfigurationUpdater implements PackageConfigurationUpdater { 
        return this;

    }



    @Override

    public PackageConfigurationUpdater setGrammaticalGender(int gender) {

        mGender = gender;

        return this;

    }



    @Override

    public boolean commit() {

        return mLocales != null;
@@ -56,4 +66,10 @@ class FakePackageConfigurationUpdater implements PackageConfigurationUpdater { 
        return mLocales;

    }



    /**

     * Returns the gender that were stored during the test run.

     */

    int getGender() {

        return mGender;

    }

}

services/tests/servicestests/src/com/android/server/locales/LocaleManagerServiceTest.java

+14 −6
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.locales;



import static android.content.res.Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED;



import static com.google.common.truth.Truth.assertThat;



import static junit.framework.Assert.assertEquals;
@@ -234,7 +236,8 @@ public class LocaleManagerServiceTest { 
            throws Exception {

        doReturn(DEFAULT_UID).when(mMockPackageManager)

                .getPackageUidAsUser(anyString(), any(), anyInt());

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES))

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(anyString(), anyInt());

        String imPkgName = getCurrentInputMethodPackageName();

        doReturn(Binder.getCallingUid()).when(mMockPackageManager)
@@ -274,7 +277,8 @@ public class LocaleManagerServiceTest { 
        doReturn(DEFAULT_UID).when(mMockPackageManager)

                .getPackageUidAsUser(anyString(), any(), anyInt());

        setUpPassingPermissionCheckFor(Manifest.permission.READ_APP_SPECIFIC_LOCALES);

        doReturn(new PackageConfig(/* nightMode = */ 0, /* locales = */ null))

        doReturn(new PackageConfig(/* nightMode = */ 0, /* locales = */ null,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(any(), anyInt());



        LocaleList locales = mLocaleManagerService.getApplicationLocales(
@@ -288,7 +292,8 @@ public class LocaleManagerServiceTest { 
            throws Exception {

        doReturn(Binder.getCallingUid()).when(mMockPackageManager)

                .getPackageUidAsUser(anyString(), any(), anyInt());

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES))

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(anyString(), anyInt());



        LocaleList locales =
@@ -303,7 +308,8 @@ public class LocaleManagerServiceTest { 
        doReturn(DEFAULT_UID).when(mMockPackageManager)

                .getPackageUidAsUser(anyString(), any(), anyInt());

        setUpPassingPermissionCheckFor(Manifest.permission.READ_APP_SPECIFIC_LOCALES);

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES))

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(anyString(), anyInt());



        LocaleList locales =
@@ -319,7 +325,8 @@ public class LocaleManagerServiceTest { 
                .getPackageUidAsUser(eq(DEFAULT_PACKAGE_NAME), any(), anyInt());

        doReturn(Binder.getCallingUid()).when(mMockPackageManager)

                .getPackageUidAsUser(eq(DEFAULT_INSTALLER_PACKAGE_NAME), any(), anyInt());

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES))

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(anyString(), anyInt());



        LocaleList locales =
@@ -334,7 +341,8 @@ public class LocaleManagerServiceTest { 
            throws Exception {

        doReturn(DEFAULT_UID).when(mMockPackageManager)

                .getPackageUidAsUser(anyString(), any(), anyInt());

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES))

        doReturn(new PackageConfig(/* nightMode = */ 0, DEFAULT_LOCALES,

                GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager).getApplicationConfig(anyString(), anyInt());

        String imPkgName = getCurrentInputMethodPackageName();

        doReturn(Binder.getCallingUid()).when(mMockPackageManager)

services/tests/servicestests/src/com/android/server/locales/SystemAppUpdateTrackerTest.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.locales;



import static android.content.res.Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertTrue;
@@ -168,7 +170,8 @@ public class SystemAppUpdateTrackerTest { 
            /* isUpdatedSystemApp = */ true))

            .when(mMockPackageManager).getApplicationInfo(eq(DEFAULT_PACKAGE_NAME_1), any());

        doReturn(new ActivityTaskManagerInternal.PackageConfig(/* nightMode = */ 0,

                DEFAULT_LOCALES)).when(mMockActivityTaskManager)

                        DEFAULT_LOCALES, GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager)

                .getApplicationConfig(anyString(), anyInt());



        mPackageMonitor.onPackageUpdateFinished(DEFAULT_PACKAGE_NAME_1,
@@ -186,7 +189,8 @@ public class SystemAppUpdateTrackerTest { 
            /* isUpdatedSystemApp = */ true))

            .when(mMockPackageManager).getApplicationInfo(eq(DEFAULT_PACKAGE_NAME_1), any());

        doReturn(new ActivityTaskManagerInternal.PackageConfig(/* nightMode = */ 0,

                DEFAULT_LOCALES)).when(mMockActivityTaskManager)

                        DEFAULT_LOCALES, GRAMMATICAL_GENDER_NOT_SPECIFIED))

                .when(mMockActivityTaskManager)

                .getApplicationConfig(anyString(), anyInt());



        // first update

services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java

+7 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.content.res.Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED;

import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
@@ -414,9 +415,10 @@ public class WindowProcessControllerTests extends WindowTestsBase { 
    public void testTopActivityUiModeChangeScheduleConfigChange() {

        final ActivityRecord activity = createActivityRecord(mWpc);

        activity.setVisibleRequested(true);

        doReturn(true).when(activity).applyAppSpecificConfig(anyInt(), any());

        doReturn(true).when(activity).applyAppSpecificConfig(anyInt(), any(), anyInt());

        mWpc.updateAppSpecificSettingsForAllActivitiesInPackage(DEFAULT_COMPONENT_PACKAGE_NAME,

                Configuration.UI_MODE_NIGHT_YES, LocaleList.forLanguageTags("en-XA"));

                Configuration.UI_MODE_NIGHT_YES, LocaleList.forLanguageTags("en-XA"),

                GRAMMATICAL_GENDER_NOT_SPECIFIED);

        verify(activity).ensureActivityConfiguration(anyInt(), anyBoolean());

    }
@@ -425,8 +427,9 @@ public class WindowProcessControllerTests extends WindowTestsBase { 
        final ActivityRecord activity = createActivityRecord(mWpc);

        activity.setVisibleRequested(true);

        mWpc.updateAppSpecificSettingsForAllActivitiesInPackage("com.different.package",

                Configuration.UI_MODE_NIGHT_YES, LocaleList.forLanguageTags("en-XA"));

        verify(activity, never()).applyAppSpecificConfig(anyInt(), any());

                Configuration.UI_MODE_NIGHT_YES, LocaleList.forLanguageTags("en-XA"),

                GRAMMATICAL_GENDER_NOT_SPECIFIED);

        verify(activity, never()).applyAppSpecificConfig(anyInt(), any(), anyInt());

        verify(activity, never()).ensureActivityConfiguration(anyInt(), anyBoolean());

    }