Remove LoopeMode.LEGACY usage from two test classes
Bug: 330824314
Test: atest
Change-Id: I6dea662c4dea226d06b17d0d5463f01cb668a67d
diff --git a/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java b/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
index 527ea44..793aaab 100644
--- a/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/BackGestureIndicatorViewTest.java
@@ -21,20 +21,25 @@
import android.content.Context;
import android.widget.ImageView;
+import androidx.test.core.app.ApplicationProvider;
+
import com.android.settings.R;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
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.RuntimeEnvironment;
-import org.robolectric.annotation.LooperMode;
+import org.robolectric.shadows.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
-@LooperMode(LooperMode.Mode.LEGACY)
public class BackGestureIndicatorViewTest {
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
private Context mContext;
private BackGestureIndicatorDrawable mLeftDrawable;
@@ -44,9 +49,7 @@
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- mContext = RuntimeEnvironment.application;
+ mContext = ApplicationProvider.getApplicationContext();
mView = new BackGestureIndicatorView(mContext);
mLeftDrawable = (BackGestureIndicatorDrawable) ((ImageView) mView.findViewById(
@@ -59,6 +62,7 @@
public void testSetIndicatoreWidth() {
mView.setIndicatorWidth(25, true);
mView.setIndicatorWidth(52, false);
+ ShadowLooper.idleMainLooper();
assertEquals(25, mLeftDrawable.getWidth());
assertEquals(52, mRightDrawable.getWidth());
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
index b75240c..4834127 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
@@ -23,21 +23,26 @@
import android.content.Intent;
import android.media.AudioManager;
+import androidx.test.core.app.ApplicationProvider;
+
import com.android.settings.homepage.contextualcards.ContextualCard;
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 AbnormalRingerConditionControllerBaseTest {
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
@Mock
private ConditionManager mConditionManager;
@@ -46,8 +51,7 @@
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = ApplicationProvider.getApplicationContext();
mCondition = new TestCondition(mContext, mConditionManager);
}
@@ -60,9 +64,13 @@
mCondition.startMonitoringStateChange();
mContext.sendBroadcast(broadcast1);
+ ShadowLooper.idleMainLooper();
+
verify(mConditionManager, never()).onConditionChanged();
mContext.sendBroadcast(broadcast2);
+ ShadowLooper.idleMainLooper();
+
verify(mConditionManager).onConditionChanged();
}