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

Commit 98a0aba6 authored by Jeremy Meyer's avatar Jeremy Meyer
Browse files

Fix locale dependent tests 

A couple of tests depend on a certain locale being set without actually
setting it. These tests then fail depending on the order of these and
other tests being ran. This has those tests set the locale that they
depend on.

Bug: 290377322
Bug: 290377794
Bug: 290377713
Test: Running these tests both locally and in abtd
Change-Id: Ife73989406fbb0fbb830688d8e15604255605fb0
parent 81dba11a

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when; 


import android.animation.Animator;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.PixelFormat;

import android.graphics.drawable.Drawable;
@@ -90,6 +91,7 @@ import org.mockito.quality.Strictness; 


import java.util.ArrayList;

import java.util.List;

import java.util.Locale;

import java.util.Map;



@SmallTest
@@ -182,6 +184,8 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
    private List<WifiEntry> mAccessPoints = new ArrayList<>();

    private List<WifiEntry> mWifiEntries = new ArrayList<>();



    private Configuration mConfig;



    @Before

    public void setUp() {

        mStaticMockSession = mockitoSession()
@@ -226,11 +230,17 @@ public class InternetDialogControllerTest extends SysuiTestCase { 
        mInternetDialogController.mActivityStarter = mActivityStarter;

        mInternetDialogController.mWifiIconInjector = mWifiIconInjector;

        mFlags.set(Flags.QS_SECONDARY_DATA_SUB_INFO, false);



        mConfig = new Configuration(mContext.getResources().getConfiguration());

        Configuration c2 = new Configuration(mConfig);

        c2.setLocale(Locale.US);

        mContext.getResources().updateConfiguration(c2, null);

    }



    @After

    public void tearDown() {

        mStaticMockSession.finishMocking();

        mContext.getResources().updateConfiguration(mConfig, null);

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/FeedbackInfoTest.java

+14 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.app.NotificationChannel; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.graphics.drawable.Drawable;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;
@@ -60,12 +61,15 @@ import com.android.systemui.statusbar.notification.AssistantFeedbackController; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import java.util.Locale;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@UiThreadTest
@@ -87,6 +91,8 @@ public class FeedbackInfoTest extends SysuiTestCase { 
    @Mock

    private NotificationGutsManager mNotificationGutsManager;



    private Configuration mConfig;



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);
@@ -111,7 +117,15 @@ public class FeedbackInfoTest extends SysuiTestCase { 


        mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0,

                new Notification(), UserHandle.CURRENT, null, 0);

        mConfig = new Configuration(mContext.getResources().getConfiguration());

        Configuration c2 = new Configuration(mConfig);

        c2.setLocale(Locale.US);

        mContext.getResources().updateConfiguration(c2, null);

    }



    @After

    public void tearDown() {

        mContext.getResources().updateConfiguration(mConfig, null);

    }



    @Test