Loading tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java +0 −2 Original line number Diff line number Diff line Loading @@ -34,7 +34,6 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; 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; Loading @@ -44,7 +43,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; @Ignore("b/315133235") @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class}) public class RestrictedButtonTest { Loading tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +7 −8 Original line number Diff line number Diff line Loading @@ -35,18 +35,19 @@ import android.widget.ImageView; 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.Ignore; 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.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; Loading @@ -55,7 +56,8 @@ import org.robolectric.shadows.androidx.fragment.FragmentController; 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; Loading @@ -68,9 +70,7 @@ public class VideoPreferenceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mContext = ApplicationProvider.getApplicationContext(); mAnimationController = spy( new MediaAnimationController(mContext, R.raw.sample_video)); mVideoPreference = new VideoPreference(mContext, null /* attrs */); Loading Loading @@ -141,7 +141,6 @@ public class VideoPreferenceTest { assertThat(mAnimationController.isPlaying()).isTrue(); } @Ignore("b/315133235") @Test @Config(qualifiers = "mcc999") public void onViewVisible_createAnimationController() { Loading Loading
tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java +0 −2 Original line number Diff line number Diff line Loading @@ -34,7 +34,6 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; 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; Loading @@ -44,7 +43,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; @Ignore("b/315133235") @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class}) public class RestrictedButtonTest { Loading
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +7 −8 Original line number Diff line number Diff line Loading @@ -35,18 +35,19 @@ import android.widget.ImageView; 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.Ignore; 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.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; Loading @@ -55,7 +56,8 @@ import org.robolectric.shadows.androidx.fragment.FragmentController; 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; Loading @@ -68,9 +70,7 @@ public class VideoPreferenceTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; mContext = ApplicationProvider.getApplicationContext(); mAnimationController = spy( new MediaAnimationController(mContext, R.raw.sample_video)); mVideoPreference = new VideoPreference(mContext, null /* attrs */); Loading Loading @@ -141,7 +141,6 @@ public class VideoPreferenceTest { assertThat(mAnimationController.isPlaying()).isTrue(); } @Ignore("b/315133235") @Test @Config(qualifiers = "mcc999") public void onViewVisible_createAnimationController() { Loading