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

Remove LoopeMode.LEGACY usage from two test classes

Browse Source 
Bug: 330824314

Test: atest
Change-Id: I6dea662c4dea226d06b17d0d5463f01cb668a67d
This commit is contained in:
Fan Wu
2024-04-10 03:59:53 +00:00
parent 6a59b93701
commit b9798f0798
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
View File

@@ -21,20 +21,25 @@ import static org.junit.Assert.assertEquals;
import android.content.Context; import android.content.Context;
import android.widget.ImageView; import android.widget.ImageView;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
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.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 BackGestureIndicatorViewTest { public class BackGestureIndicatorViewTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
private Context mContext; private Context mContext;
private BackGestureIndicatorDrawable mLeftDrawable; private BackGestureIndicatorDrawable mLeftDrawable;
@@ -44,9 +49,7 @@ public class BackGestureIndicatorViewTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = ApplicationProvider.getApplicationContext();
mContext = RuntimeEnvironment.application;
mView = new BackGestureIndicatorView(mContext); mView = new BackGestureIndicatorView(mContext);
mLeftDrawable = (BackGestureIndicatorDrawable) ((ImageView) mView.findViewById( mLeftDrawable = (BackGestureIndicatorDrawable) ((ImageView) mView.findViewById(
@@ -59,6 +62,7 @@ public class BackGestureIndicatorViewTest {
public void testSetIndicatoreWidth() { public void testSetIndicatoreWidth() {
mView.setIndicatorWidth(25, true); mView.setIndicatorWidth(25, true);
mView.setIndicatorWidth(52, false); mView.setIndicatorWidth(52, false);
ShadowLooper.idleMainLooper();
assertEquals(25, mLeftDrawable.getWidth()); assertEquals(25, mLeftDrawable.getWidth());
assertEquals(52, mRightDrawable.getWidth()); assertEquals(52, mRightDrawable.getWidth());

20
tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
View File

@@ -23,21 +23,26 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.media.AudioManager; import android.media.AudioManager;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.homepage.contextualcards.ContextualCard; import com.android.settings.homepage.contextualcards.ContextualCard;
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 AbnormalRingerConditionControllerBaseTest { public class AbnormalRingerConditionControllerBaseTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock @Mock
private ConditionManager mConditionManager; private ConditionManager mConditionManager;
@@ -46,8 +51,7 @@ public class AbnormalRingerConditionControllerBaseTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = ApplicationProvider.getApplicationContext();
mContext = RuntimeEnvironment.application;
mCondition = new TestCondition(mContext, mConditionManager); mCondition = new TestCondition(mContext, mConditionManager);
} }
@@ -60,9 +64,13 @@ public class AbnormalRingerConditionControllerBaseTest {
mCondition.startMonitoringStateChange(); mCondition.startMonitoringStateChange();
mContext.sendBroadcast(broadcast1); mContext.sendBroadcast(broadcast1);
ShadowLooper.idleMainLooper();
verify(mConditionManager, never()).onConditionChanged(); verify(mConditionManager, never()).onConditionChanged();
mContext.sendBroadcast(broadcast2); mContext.sendBroadcast(broadcast2);
ShadowLooper.idleMainLooper();
verify(mConditionManager).onConditionChanged(); verify(mConditionManager).onConditionChanged();
} }