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

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

Browse Source
This commit is contained in:
Fan Wu
2024-02-29 08:53:15 +00:00
committed by Android (Google) Code Review
parent e6ad7fc215 cfb73e2dd3
commit c59c3a3d4f
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java
View File

@@ -34,7 +34,6 @@ 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;
@@ -44,7 +43,6 @@ 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 {

15
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
View File

@@ -35,18 +35,19 @@ 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.Ignore; 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.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController; import org.robolectric.shadows.androidx.fragment.FragmentController;
@@ -55,7 +56,8 @@ 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;
@@ -68,9 +70,7 @@ public class VideoPreferenceTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = ApplicationProvider.getApplicationContext();
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,7 +141,6 @@ 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() {