Upstream version 7.36.149.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 d8c5fa8..ee50901 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
@@ -4,38 +4,63 @@
 
 package org.chromium.android_webview.test;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 
 import org.chromium.android_webview.test.util.VideoTestWebServer;
 import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.ContentVideoView;
 import org.chromium.content.browser.test.util.TouchCommon;
 
 /**
  * Test WebChromeClient::onShow/HideCustomView.
  */
 public class AwContentsClientFullScreenVideoTest extends AwTestBase {
+    private FullScreenVideoTestAwContentsClient mContentsClient;
 
+    @MediumTest
     @Feature({"AndroidWebView"})
-    @SmallTest
-    public void testOnShowAndHideCustomView() throws Throwable {
-        FullScreenVideoTestAwContentsClient contentsClient =
-                new FullScreenVideoTestAwContentsClient(getActivity());
+    public void testOnShowAndHideCustomViewWithCallback() throws Throwable {
+        doOnShowAndHideCustomViewTest(new Runnable() {
+            @Override
+            public void run() {
+                mContentsClient.getExitCallback().onCustomViewHidden();
+            }
+        });
+    }
+
+    @MediumTest
+    @Feature({"AndroidWebView"})
+    public void testOnShowAndHideCustomViewWithBackKey() throws Throwable {
+        doOnShowAndHideCustomViewTest(new Runnable() {
+            @Override
+            public void run() {
+                ContentVideoView view = mContentsClient.getVideoView();
+                view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
+                view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK));
+            }
+        });
+    }
+
+    private void doOnShowAndHideCustomViewTest(Runnable existFullscreen) throws Throwable {
+        mContentsClient = new FullScreenVideoTestAwContentsClient(getActivity());
         AwTestContainerView testContainerView =
-                createAwTestContainerViewOnMainSync(contentsClient);
+                createAwTestContainerViewOnMainSync(mContentsClient);
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
         VideoTestWebServer webServer = new VideoTestWebServer(
                 getInstrumentation().getTargetContext());
         try {
             loadUrlSync(testContainerView.getAwContents(),
-                    contentsClient.getOnPageFinishedHelper(),
+                    mContentsClient.getOnPageFinishedHelper(),
                     webServer.getFullScreenVideoTestURL());
             Thread.sleep(5 * 1000);
+
             TouchCommon touchCommon = new TouchCommon(this);
             touchCommon.singleClickView(testContainerView);
-            contentsClient.waitForCustomViewShown();
-            getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
-            contentsClient.waitForCustomViewHidden();
+            mContentsClient.waitForCustomViewShown();
+
+            getInstrumentation().runOnMainSync(existFullscreen);
+            mContentsClient.waitForCustomViewHidden();
         } finally {
             if (webServer != null) webServer.getTestWebServer().shutdown();
         }