PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove LooperMode.LEGACY usage from two test classes" into main

Browse Source
This commit is contained in:
Fan Wu
2024-03-29 10:10:18 +00:00
committed by Android (Google) Code Review
parent 3fdb68c2c2 4bb2bff03e
commit 70272cdcde
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/accounts/ManagedProfileQuietModeEnablerTest.java
View File

@@ -48,9 +48,10 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; 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.ParameterizedRobolectricTestRunner;
import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.ShadowLooper;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -58,8 +59,11 @@ import java.util.List;
@RunWith(ParameterizedRobolectricTestRunner.class) @RunWith(ParameterizedRobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class ManagedProfileQuietModeEnablerTest { public class ManagedProfileQuietModeEnablerTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private static final int MANAGED_USER_ID = 10; private static final int MANAGED_USER_ID = 10;
private Context mContext; private Context mContext;
private ManagedProfileQuietModeEnabler mQuietModeEnabler; private ManagedProfileQuietModeEnabler mQuietModeEnabler;
@@ -96,7 +100,6 @@ public class ManagedProfileQuietModeEnablerTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext()); mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mUserInfo.isManagedProfile()).thenReturn(true); when(mUserInfo.isManagedProfile()).thenReturn(true);
@@ -140,6 +143,7 @@ public class ManagedProfileQuietModeEnablerTest {
Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID)); Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID));
mContext.sendBroadcast(new Intent(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE).putExtra( mContext.sendBroadcast(new Intent(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE).putExtra(
Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID)); Intent.EXTRA_USER_HANDLE, MANAGED_USER_ID));
ShadowLooper.idleMainLooper();
verify(mOnQuietModeChangeListener, times(2)).onQuietModeChanged(); verify(mOnQuietModeChangeListener, times(2)).onQuietModeChanged();
} }

17
tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
View File

@@ -25,23 +25,28 @@ import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import androidx.test.core.app.ApplicationProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnResume;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; 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.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowLooper;
import org.robolectric.annotation.LooperMode;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class TimeChangeListenerMixinTest { public class TimeChangeListenerMixinTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock @Mock
private UpdateTimeAndDateCallback mCallback; private UpdateTimeAndDateCallback mCallback;
@@ -50,8 +55,7 @@ public class TimeChangeListenerMixinTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = ApplicationProvider.getApplicationContext();
mContext = RuntimeEnvironment.application;
mMixin = new TimeChangeListenerMixin(mContext, mCallback); mMixin = new TimeChangeListenerMixin(mContext, mCallback);
} }
@@ -69,6 +73,7 @@ public class TimeChangeListenerMixinTest {
mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED) mContext.sendBroadcast(new Intent(Intent.ACTION_TIME_CHANGED)
.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND)); .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND));
mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED)); mContext.sendBroadcast(new Intent(Intent.ACTION_TIMEZONE_CHANGED));
ShadowLooper.idleMainLooper();
verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext); verify(mCallback, times(3)).updateTimeAndDateDisplay(mContext);
} }