Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f740e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Re-enable failed tests under settings/widget/"" into main

parents 8371b431 4826dd8c

tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settings.testutils.shadow.ShadowDevicePolicyManager; 
import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settings.testutils.shadow.ShadowUserManager;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;

import org.robolectric.Robolectric;
@@ -43,6 +44,7 @@ import org.robolectric.annotation.Config; 
import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;





@Ignore("b/315133235")

@RunWith(RobolectricTestRunner.class)

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class})

@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class})

public class RestrictedButtonTest {

public class RestrictedButtonTest {

tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -35,19 +35,18 @@ import android.widget.ImageView; 




import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceViewHolder;

import androidx.preference.PreferenceViewHolder;

import androidx.test.core.app.ApplicationProvider;





import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;

import com.android.settings.testutils.shadow.ShadowSettingsMediaPlayer;





import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Ignore;

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.junit.MockitoJUnit;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.androidx.fragment.FragmentController;

import org.robolectric.shadows.androidx.fragment.FragmentController;
@@ -56,8 +55,7 @@ import org.robolectric.shadows.androidx.fragment.FragmentController; 
public class VideoPreferenceTest {

public class VideoPreferenceTest {

    private static final int VIDEO_WIDTH = 100;

    private static final int VIDEO_WIDTH = 100;

    private static final int VIDEO_HEIGHT = 150;

    private static final int VIDEO_HEIGHT = 150;

    @Rule



    public final MockitoRule mMockitoRule = MockitoJUnit.rule();

    private VideoPreference.AnimationController mAnimationController;

    private VideoPreference.AnimationController mAnimationController;

    @Mock

    @Mock

    private ImageView fakePreview;

    private ImageView fakePreview;
@@ -70,7 +68,9 @@ public class VideoPreferenceTest { 




    @Before

    @Before

    public void setUp() {

    public void setUp() {

        mContext = ApplicationProvider.getApplicationContext();

        MockitoAnnotations.initMocks(this);



        mContext = RuntimeEnvironment.application;

        mAnimationController = spy(

        mAnimationController = spy(

                new MediaAnimationController(mContext, R.raw.sample_video));

                new MediaAnimationController(mContext, R.raw.sample_video));

        mVideoPreference = new VideoPreference(mContext, null /* attrs */);

        mVideoPreference = new VideoPreference(mContext, null /* attrs */);
@@ -141,6 +141,7 @@ public class VideoPreferenceTest { 
        assertThat(mAnimationController.isPlaying()).isTrue();

        assertThat(mAnimationController.isPlaying()).isTrue();

    }

    }





    @Ignore("b/315133235")

    @Test

    @Test

    @Config(qualifiers = "mcc999")

    @Config(qualifiers = "mcc999")

    public void onViewVisible_createAnimationController() {

    public void onViewVisible_createAnimationController() {