Upstream version 11.39.266.0

[platform/framework/web/crosswalk.git] / src / android_webview / javatests / src / org / chromium / android_webview / test / AwContentsClientFullScreenVideoTest.java

diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
index fb29ea5..32bea17 100644 (file)
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
@@ -5,18 +5,15 @@
 package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
-import android.view.KeyEvent;
-import android.view.View;
 
 import junit.framework.Assert;
 
+import org.chromium.android_webview.test.util.JavascriptEventObserver;
 import org.chromium.android_webview.test.util.VideoTestWebServer;
-import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TouchCommon;
-import org.chromium.content.common.ContentSwitches;
 
 /**
  * Test WebChromeClient::onShow/HideCustomView.
@@ -24,25 +21,26 @@ import org.chromium.content.common.ContentSwitches;
 public class AwContentsClientFullScreenVideoTest extends AwTestBase {
     private FullScreenVideoTestAwContentsClient mContentsClient;
     private ContentViewCore mContentViewCore;
-    private VideoTestWebServer webServer;
-    private AwTestContainerView testContainerView;
+    private VideoTestWebServer mWebServer;
+    private AwTestContainerView mTestContainerView;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mContentsClient = new FullScreenVideoTestAwContentsClient(getActivity());
-        testContainerView =
+        mTestContainerView =
                 createAwTestContainerViewOnMainSync(mContentsClient);
-        mContentViewCore = testContainerView.getContentViewCore();
-        enableJavaScriptOnUiThread(testContainerView.getAwContents());
-        webServer = new VideoTestWebServer(
+        mContentViewCore = mTestContainerView.getContentViewCore();
+        enableJavaScriptOnUiThread(mTestContainerView.getAwContents());
+        mTestContainerView.getAwContents().getSettings().setFullscreenSupported(true);
+        mWebServer = new VideoTestWebServer(
                 getInstrumentation().getTargetContext());
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        if (webServer != null) webServer.getTestWebServer().shutdown();
+        if (mWebServer != null) mWebServer.getTestWebServer().shutdown();
     }
 
     @MediumTest
@@ -58,26 +56,6 @@ public class AwContentsClientFullScreenVideoTest extends AwTestBase {
 
     @MediumTest
     @Feature({"AndroidWebView"})
-    public void testOnShowAndHideCustomViewWithBackKeyLegacy() throws Throwable {
-        // When html controls are enabled we skip this test because pressing the back key
-        // moves away from the current activity instead of exiting fullscreen mode.
-        if (areHtmlControlsEnabled())
-            return;
-
-        doOnShowAndHideCustomViewTest(new Runnable() {
-            @Override
-            public void run() {
-                View customView = mContentsClient.getCustomView();
-                customView.dispatchKeyEvent(
-                        new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
-                customView.dispatchKeyEvent(
-                        new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK));
-            }
-        });
-    }
-
-    @MediumTest
-    @Feature({"AndroidWebView"})
     public void testOnShowAndHideCustomViewWithJavascript() throws Throwable {
         doOnShowAndHideCustomViewTest(new Runnable() {
             @Override
@@ -90,9 +68,6 @@ public class AwContentsClientFullScreenVideoTest extends AwTestBase {
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewAndPlayWithHtmlControl() throws Throwable {
-        if (!areHtmlControlsEnabled())
-            return;
-
         doOnShowCustomViewTest();
         Assert.assertFalse(DOMUtils.hasVideoEnded(
                 mContentViewCore, VideoTestWebServer.VIDEO_ID));
@@ -109,9 +84,23 @@ public class AwContentsClientFullScreenVideoTest extends AwTestBase {
                 mContentViewCore, VideoTestWebServer.VIDEO_ID));
     }
 
-    private static boolean areHtmlControlsEnabled() {
-        return !CommandLine.getInstance().hasSwitch(
-                ContentSwitches.DISABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE);
+    @MediumTest
+    @Feature({"AndroidWebView"})
+    public void testFullscreenNotSupported() throws Throwable {
+        mTestContainerView.getAwContents().getSettings().setFullscreenSupported(false);
+
+        final JavascriptEventObserver fullScreenErrorObserver = new JavascriptEventObserver();
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                fullScreenErrorObserver.register(mContentViewCore, "javaFullScreenErrorObserver");
+            }
+        });
+
+        loadTestPageAndClickFullscreen();
+
+        Assert.assertTrue(fullScreenErrorObserver.waitForEvent(500));
+        Assert.assertFalse(mContentsClient.wasCustomViewShownCalled());
     }
 
     private void doOnShowAndHideCustomViewTest(final Runnable existFullscreen)
@@ -122,13 +111,17 @@ public class AwContentsClientFullScreenVideoTest extends AwTestBase {
     }
 
     private void doOnShowCustomViewTest() throws Exception {
-        loadUrlSync(testContainerView.getAwContents(),
+        loadTestPageAndClickFullscreen();
+        mContentsClient.waitForCustomViewShown();
+    }
+
+    private void loadTestPageAndClickFullscreen() throws Exception {
+        loadUrlSync(mTestContainerView.getAwContents(),
                 mContentsClient.getOnPageFinishedHelper(),
-                webServer.getFullScreenVideoTestURL());
+                mWebServer.getFullScreenVideoTestURL());
 
         // Click the button in full_screen_video_test.html to enter fullscreen.
         TouchCommon touchCommon = new TouchCommon(this);
-        touchCommon.singleClickView(testContainerView);
-        mContentsClient.waitForCustomViewShown();
+        touchCommon.singleClickView(mTestContainerView);
     }
 }