Commit cac20471 authored by Finnur Thorarinsson's avatar Finnur Thorarinsson Committed by Commit Bot

[Android] Photo Picker: Disable animations in test.

During a local run a render test failed because the empty
view animation had not completely disappeared. Disabling
the animations should take care of that.

Bug: 656015
Change-Id: I7c27c93842f6d8447d0b10b7cda8b45a209d92ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2127087Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754878}
parent a0baed53
...@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -39,6 +40,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega ...@@ -39,6 +40,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.content_public.browser.test.util.TouchCommon; import org.chromium.content_public.browser.test.util.TouchCommon;
import org.chromium.ui.PhotoPickerListener; import org.chromium.ui.PhotoPickerListener;
import org.chromium.ui.test.util.DisableAnimationsTestRule;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -57,6 +59,10 @@ public class PhotoPickerDialogTest implements PhotoPickerListener, SelectionObse ...@@ -57,6 +59,10 @@ public class PhotoPickerDialogTest implements PhotoPickerListener, SelectionObse
DecoderServiceHost.DecoderStatusCallback, DecoderServiceHost.DecoderStatusCallback,
PickerVideoPlayer.VideoPlaybackStatusCallback, PickerVideoPlayer.VideoPlaybackStatusCallback,
AnimationListener { AnimationListener {
@ClassRule
public static DisableAnimationsTestRule mDisableAnimationsTestRule =
new DisableAnimationsTestRule();
// The timeout (in seconds) to wait for the decoder service to be ready. // The timeout (in seconds) to wait for the decoder service to be ready.
private static final long WAIT_TIMEOUT_SECONDS = 30L; private static final long WAIT_TIMEOUT_SECONDS = 30L;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment