Index: chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenWebContentsActivityTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenWebContentsActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenWebContentsActivityTest.java |
deleted file mode 100644 |
index c69449d9096156be39919f5f6893d54a4820bb49..0000000000000000000000000000000000000000 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenWebContentsActivityTest.java |
+++ /dev/null |
@@ -1,160 +0,0 @@ |
-// 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.chrome.browser; |
- |
-import android.app.Activity; |
-import android.content.Intent; |
-import android.provider.Browser; |
-import android.support.test.filters.MediumTest; |
-import android.support.test.rule.UiThreadTestRule; |
- |
-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.ApplicationStatus; |
-import org.chromium.base.test.util.CommandLineFlags; |
-import org.chromium.chrome.browser.tab.Tab; |
-import org.chromium.chrome.test.ChromeActivityTestRule; |
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner; |
-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.common.ContentSwitches; |
-import org.chromium.content_public.browser.WebContents; |
-import org.chromium.net.test.EmbeddedTestServer; |
-/** |
- * Tests for FullscreenWebContentsActivity. |
- */ |
-@RunWith(ChromeJUnit4ClassRunner.class) |
-@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE, |
- ContentSwitches.DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK, |
- "enable-features=" + ChromeFeatureList.FULLSCREEN_ACTIVITY}) |
-public class FullscreenWebContentsActivityTest { |
- private static final String TEST_PATH = "/content/test/data/media/video-player.html"; |
- private static final String VIDEO_ID = "video"; |
- |
- @Rule |
- public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule(); |
- @Rule |
- public ChromeActivityTestRule<ChromeTabbedActivity> mActivityTestRule = |
- new ChromeActivityTestRule<>(ChromeTabbedActivity.class); |
- |
- private EmbeddedTestServer mTestServer; |
- private ChromeTabbedActivity mActivity; |
- |
- @Before |
- public void setUp() throws InterruptedException { |
- mTestServer = EmbeddedTestServer.createAndStartServer( |
- mActivityTestRule.getInstrumentation().getContext()); |
- mActivityTestRule.startMainActivityWithURL(mTestServer.getURL(TEST_PATH)); |
- mActivity = mActivityTestRule.getActivity(); |
- } |
- |
- @After |
- public void tearDown() throws Exception { |
- mTestServer.stopAndDestroyServer(); |
- } |
- |
- /** |
- * Manually moves a Tab from a ChromeTabbedActivity to a FullscreenWebContentsActivity and back. |
- */ |
- @Test |
- @MediumTest |
- public void testTransfer() throws Throwable { |
- final Tab tab = mActivityTestRule.getActivity().getActivityTab(); |
- |
- moveTabToActivity(mActivity, tab, FullscreenWebContentsActivity.class); |
- waitForActivity(FullscreenWebContentsActivity.class); |
- |
- final FullscreenWebContentsActivity fullscreenActivity = |
- (FullscreenWebContentsActivity) ApplicationStatus.getLastTrackedFocusedActivity(); |
- Assert.assertEquals(tab.getId(), fullscreenActivity.getActivityTab().getId()); |
- |
- moveTabToActivity(fullscreenActivity, tab, ChromeTabbedActivity.class); |
- waitForActivity(ChromeTabbedActivity.class); |
- } |
- |
- /** |
- * Manually moves the Tab to an Activity. |
- */ |
- private void moveTabToActivity(final Activity fromActivity, final Tab tab, |
- final Class<? extends ChromeActivity> targetClass) throws Throwable { |
- mUiThreadTestRule.runOnUiThread(new Runnable() { |
- @Override |
- public void run() { |
- Intent intent = new Intent(fromActivity, targetClass); |
- intent.putExtra( |
- IntentHandler.EXTRA_PARENT_COMPONENT, fromActivity.getComponentName()); |
- intent.putExtra(Browser.EXTRA_APPLICATION_ID, fromActivity.getPackageName()); |
- |
- if (targetClass == FullscreenWebContentsActivity.class) { |
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); |
- } |
- |
- tab.detachAndStartReparenting(intent, null, null); |
- } |
- }); |
- } |
- |
- /** |
- * Waits for an Activity of the given class to be started and for it to have a Tab. |
- */ |
- private static void waitForActivity(final Class<? extends ChromeActivity> activityClass) { |
- CriteriaHelper.pollUiThread(new Criteria() { |
- @Override |
- public boolean isSatisfied() { |
- Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity(); |
- if (lastActivity.getClass() != activityClass) return false; |
- |
- return ((ChromeActivity) lastActivity).getActivityTab() != null; |
- } |
- }); |
- } |
- |
- /** |
- * Toggles fullscreen to check FullscreenWebContentsActivity has been started. |
- */ |
- @Test |
- @MediumTest |
- public void testFullscreen() throws Throwable { |
- enterFullscreen(); |
- // TODO(peconn): Test leaving fullscreen by pressing Back |
- // TODO(peconn): Test leaving fullscreen by DOMUtils.exitFullscreen(WebContents) |
- } |
- |
- /** |
- * Clicks on the fullscreen button in the webpage and waits for the |
- * FullscreenWebContentsActivity to be started. |
- */ |
- private void enterFullscreen() throws Throwable { |
- // Start playback to guarantee it's properly loaded. |
- WebContents webContents = mActivity.getCurrentContentViewCore().getWebContents(); |
- Assert.assertTrue(DOMUtils.isMediaPaused(webContents, VIDEO_ID)); |
- DOMUtils.playMedia(webContents, VIDEO_ID); |
- DOMUtils.waitForMediaPlay(webContents, VIDEO_ID); |
- |
- // Trigger requestFullscreen() via a click on a button. |
- Assert.assertTrue(DOMUtils.clickNode(mActivity.getCurrentContentViewCore(), "fullscreen")); |
- waitForActivity(FullscreenWebContentsActivity.class); |
- } |
- |
- /** |
- * Tests that no flags change on the ChromeTabbedActivity when going fullscreen. |
- */ |
- @Test |
- @MediumTest |
- public void testFullscreenFlags() throws Throwable { |
- int old = mActivity.getTabsView().getSystemUiVisibility(); |
- |
- enterFullscreen(); |
- |
- Assert.assertEquals(old, mActivity.getTabsView().getSystemUiVisibility()); |
- // TODO(peconn): Test again after leaving fullscreen. |
- } |
-} |