Commit 3e1e75bb authored by ajith.v's avatar ajith.v Committed by Commit bot

Improving test coverage of Popup Zoomer

Added test coverage with device BACK key.

BUG=

Review-Url: https://codereview.chromium.org/2090633002
Cr-Commit-Position: refs/heads/master@{#403415}
parent ee2151bf
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package org.chromium.content.browser; package org.chromium.content.browser;
import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.MediumTest;
import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -17,6 +18,9 @@ import org.chromium.content_shell_apk.ContentShellTestBase; ...@@ -17,6 +18,9 @@ import org.chromium.content_shell_apk.ContentShellTestBase;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
/**
* Class which provides test coverage for Popup Zoomer.
*/
public class ContentViewPopupZoomerTest extends ContentShellTestBase { public class ContentViewPopupZoomerTest extends ContentShellTestBase {
private static PopupZoomer findPopupZoomer(ViewGroup view) { private static PopupZoomer findPopupZoomer(ViewGroup view) {
assert view != null; assert view != null;
...@@ -98,4 +102,24 @@ public class ContentViewPopupZoomerTest extends ContentShellTestBase { ...@@ -98,4 +102,24 @@ public class ContentViewPopupZoomerTest extends ContentShellTestBase {
// The shown popup should have valid dimensions eventually. // The shown popup should have valid dimensions eventually.
CriteriaHelper.pollInstrumentationThread(new PopupHasNonZeroDimensionsCriteria(view)); CriteriaHelper.pollInstrumentationThread(new PopupHasNonZeroDimensionsCriteria(view));
} }
/**
* Tests Popup zoomer hides when device back key is pressed.
*/
@MediumTest
@Feature({"Browser"})
public void testBackKeyDismissesPopupZoomer() throws InterruptedException, TimeoutException {
launchContentShellWithUrl(generateTestUrl(100, 15, "clickme"));
waitForActiveShellToBeDoneLoading();
final ContentViewCore viewCore = getContentViewCore();
final ViewGroup view = viewCore.getContainerView();
CriteriaHelper.pollInstrumentationThread(new PopupShowingCriteria(view, false));
DOMUtils.clickNode(this, viewCore, "clickme");
CriteriaHelper.pollInstrumentationThread(new PopupShowingCriteria(view, true));
sendKeys(KeyEvent.KEYCODE_BACK);
// When device key is pressed, popup zoomer should hide if already showing.
CriteriaHelper.pollInstrumentationThread(new PopupShowingCriteria(view, false));
}
} }
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