Revert "Re-enable failed tests under settings/widget/"
This reverts commit cfb73e2dd399fcae4f07cc5ffe00a0d4d2d4e087.
Reason for revert:
Still failing when running the entire test suite.
Change-Id: I1783265ca8362a2e1d4b89a1d577e1c0a35bd535
diff --git a/tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java b/tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java
index 4b05b91..d696342 100644
--- a/tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java
@@ -34,6 +34,7 @@
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
@@ -43,6 +44,7 @@
import java.util.ArrayList;
import java.util.List;
+@Ignore("b/315133235")
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class})
public class RestrictedButtonTest {
diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
index 530517f..35dc666 100644
--- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
@@ -35,19 +35,18 @@
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceViewHolder;
-import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;
import org.junit.Before;
-import org.junit.Rule;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController;
@@ -56,8 +55,7 @@
public class VideoPreferenceTest {
private static final int VIDEO_WIDTH = 100;
private static final int VIDEO_HEIGHT = 150;
- @Rule
- public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
private VideoPreference.AnimationController mAnimationController;
@Mock
private ImageView fakePreview;
@@ -70,7 +68,9 @@
@Before
public void setUp() {
- mContext = ApplicationProvider.getApplicationContext();
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
mAnimationController = spy(
new MediaAnimationController(mContext, R.raw.sample_video));
mVideoPreference = new VideoPreference(mContext, null /* attrs */);
@@ -141,6 +141,7 @@
assertThat(mAnimationController.isPlaying()).isTrue();
}
+ @Ignore("b/315133235")
@Test
@Config(qualifiers = "mcc999")
public void onViewVisible_createAnimationController() {