Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1388)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java

Issue 2869843002: [Media Controls] Instrumentation test for video rotate-to-fullscreen (Closed)
Patch Set: crbug s/719560/673917/ Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java b/content/public/android/javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..23b0ce209686289acc870b3607e4a70d73b18f15
--- /dev/null
+++ b/content/public/android/javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java
@@ -0,0 +1,123 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.content.browser;
+
+import android.content.pm.ActivityInfo;
+import android.support.test.filters.MediumTest;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.test.ContentJUnit4ClassRunner;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.content.browser.test.util.DOMUtils;
+import org.chromium.content.browser.test.util.JavaScriptUtils;
+import org.chromium.content_shell_apk.ContentShellActivityTestRule;
+import org.chromium.media.MediaSwitches;
+import org.chromium.ui.base.DeviceFormFactor;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Integration tests for the feature that automatically enters and exits fullscreen when the device
+ * is rotated whilst watching a video.
+ */
+@RunWith(ContentJUnit4ClassRunner.class)
+@CommandLineFlags.Add({"enable-features=VideoRotateToFullscreen",
+ MediaSwitches.IGNORE_AUTOPLAY_RESTRICTIONS_FOR_TESTS})
+public class VideoRotateToFullscreenTest {
+ @Rule
+ public ContentShellActivityTestRule mRule = new ContentShellActivityTestRule();
+
+ private static final String TEST_URL = "content/test/data/media/video-player.html";
+ private static final String VIDEO_ID = "video";
+
+ private void waitForContentsFullscreenState(boolean fullscreenValue) {
+ CriteriaHelper.pollInstrumentationThread(
+ Criteria.equals(fullscreenValue, new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws InterruptedException, TimeoutException {
+ return DOMUtils.isFullscreen(mRule.getWebContents());
+ }
+ }));
+ }
+
+ private void waitForScreenOrientation(String orientationValue) {
+ CriteriaHelper.pollInstrumentationThread(
+ Criteria.equals(orientationValue, new Callable<String>() {
+ @Override
+ public String call() throws InterruptedException, TimeoutException {
+ return screenOrientation();
+ }
+ }));
+ }
+
+ private String screenOrientation() throws InterruptedException, TimeoutException {
+ // Returns "\"portrait\"" or "\"landscape\"" (strips the "-primary" or "-secondary" suffix).
+ return JavaScriptUtils.executeJavaScriptAndWaitForResult(
+ mRule.getWebContents(), "screen.orientation.type.split('-')[0]");
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ mRule.launchContentShellWithUrlSync(TEST_URL);
+
+ JavaScriptUtils.executeJavaScriptAndWaitForResult(mRule.getWebContents(),
+ "document.getElementById('video').src = 'bear-320x240.webm';");
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ mRule.getActivity().setRequestedOrientation(
+ ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+ }
+ });
+ }
+
+ @Test
+ @MediumTest
+ @Feature({"VideoRotateToFullscreen"})
+ public void testPortraitToLandscapeAndBack() throws Exception {
+ // TODO(johnme): Use RESTRICTION_TYPE_PHONE once crbug.com/673917 moves it out of chrome/.
+ if (DeviceFormFactor.isTablet(mRule.getActivity())) {
+ return;
+ }
+
+ // Start off in portrait screen orientation.
+ mRule.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ waitForScreenOrientation("\"portrait\"");
+
+ // Start playback.
+ Assert.assertTrue(DOMUtils.isMediaPaused(mRule.getWebContents(), VIDEO_ID));
+ DOMUtils.playMedia(mRule.getWebContents(), VIDEO_ID);
+ DOMUtils.waitForMediaPlay(mRule.getWebContents(), VIDEO_ID);
+
+ // Rotate screen from portrait to landscape.
+ mRule.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+ waitForScreenOrientation("\"landscape\"");
+
+ // Should enter fullscreen.
+ waitForContentsFullscreenState(true);
+
+ // Rotate screen from landscape to portrait(?).
+ mRule.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ waitForScreenOrientation("\"portrait\"");
+
+ // Should exit fullscreen.
+ waitForContentsFullscreenState(false);
+ }
+}
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698