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

Commit 4bb2bff0 authored by Fan Wu's avatar Fan Wu
Browse files

Remove LooperMode.LEGACY usage from two test classes 

Bug: 330824314

Test: atest
Change-Id: Ic8e6aa633d72b7680a9ff8c6e37a66c64778c26a
parent cf3649f2

tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java

+8 −4
Original line number Diff line number Diff line
@@ -48,9 +48,10 @@ import org.junit.Rule; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.ParameterizedRobolectricTestRunner;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowLooper;



import java.util.Arrays;

import java.util.Collections;
@@ -58,8 +59,11 @@ import java.util.List; 




@RunWith(ParameterizedRobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public class ManagedProfileQuietModeEnablerTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private static final int MANAGED_USER_ID = 10;

    private Context mContext;

    private ManagedProfileQuietModeEnabler mQuietModeEnabler;
@@ -96,7 +100,6 @@ public class ManagedProfileQuietModeEnablerTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);

        when(mUserInfo.isManagedProfile()).thenReturn(true);
@@ -140,6 +143,7 @@ public class ManagedProfileQuietModeEnablerTest { 
                Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID));

        mContext.sendBroadcast(new Intent(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE).putExtra(

                Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID));

        ShadowLooper.idleMainLooper();



        verify(mOnQuietModeChangeListener, times(2)).onQuietModeChanged();

    }

tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java

+11 −6
Original line number Diff line number Diff line
@@ -25,23 +25,28 @@ import static org.mockito.Mockito.verify; 
import android.content.Context;

import android.content.Intent;



import androidx.test.core.app.ApplicationProvider;



import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.LooperMode;

import org.robolectric.shadows.ShadowLooper;



@RunWith(RobolectricTestRunner.class)

@LooperMode(LooperMode.Mode.LEGACY)

public class TimeChangeListenerMixinTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    @Mock

    private UpdateTimeAndDateCallback mCallback;
@@ -50,8 +55,7 @@ public class TimeChangeListenerMixinTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mContext = ApplicationProvider.getApplicationContext();

        mMixin = new TimeChangeListenerMixin(mContext, mCallback);

    }
@@ -69,6 +73,7 @@ public class TimeChangeListenerMixinTest { 
        mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)

                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));

        mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));

        ShadowLooper.idleMainLooper();



        verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);

    }