content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java - Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split.

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

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Small fixes and findbugs line update Created 6 years, 11 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/input/InsertionHandleTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/input/SelectionHandleTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java

deleted file mode 100644

index c007589e938c97a9e473bd110127b2825ee3717d..0000000000000000000000000000000000000000

--- a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java

+++ /dev/null

@@ -1,106 +0,0 @@

-// 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.input;

-import android.test.suitebuilder.annotation.LargeTest;

-import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout;

-import org.chromium.base.test.util.Feature;

-import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content.browser.ContentView;

-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.TestCallbackHelperContainer;

-import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;

-import org.chromium.content_shell_apk.ContentShellTestBase;

-import java.util.concurrent.TimeUnit;

-public class SelectPopupTest extends ContentShellTestBase {

- private static final long WAIT_TIMEOUT_SECONDS = ScaleTimeout(2);

- private static final String SELECT_URL = UrlUtils.encodeHtmlDataUri(

- "<html><head><meta name=\"viewport\"" +

- "content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0\" /></head>" +

- "<body>Which animal is the strongest:<br/>" +

- "<select id=\"select\">" +

- "<option>Black bear</option>" +

- "<option>Polar bear</option>" +

- "<option>Grizzly</option>" +

- "<option>Tiger</option>" +

- "<option>Lion</option>" +

- "<option>Gorilla</option>" +

- "<option>Chipmunk</option>" +

- "</select>" +

- "</body></html>");

- private static class PopupShowingCriteria implements Criteria {

- @Override

- public boolean isSatisfied() {

- return SelectPopupDialog.getCurrent() != null;

- }

- private static class PopupHiddenCriteria implements Criteria {

- @Override

- public boolean isSatisfied() {

- return SelectPopupDialog.getCurrent() == null;

- }

- @Override

- public void setUp() throws Exception {

- super.setUp();

- launchContentShellWithUrl(SELECT_URL);

- assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());

- // TODO(aurimas) remove this wait once crbug.com/179511 is fixed.

- assertWaitForPageScaleFactorMatch(1);

- }

- /**

- * Tests that showing a select popup and having the page reload while the popup is showing does

- * not assert.

- */

- @LargeTest

- @Feature({"Browser"})

- public void testReloadWhilePopupShowing() throws InterruptedException, Exception, Throwable {

- // The popup should be hidden before the click.

- assertTrue("The select popup is shown after load.",

- CriteriaHelper.pollForCriteria(new PopupHiddenCriteria()));

- final ContentView view = getActivity().getActiveContentView();

- final TestCallbackHelperContainer viewClient =

- new TestCallbackHelperContainer(view);

- final OnPageFinishedHelper onPageFinishedHelper =

- viewClient.getOnPageFinishedHelper();

- // Once clicked, the popup should show up.

- DOMUtils.clickNode(this, view, viewClient, "select");

- assertTrue("The select popup did not show up on click.",

- CriteriaHelper.pollForCriteria(new PopupShowingCriteria()));

- // Reload the test page.

- int currentCallCount = onPageFinishedHelper.getCallCount();

- getInstrumentation().runOnMainSync(new Runnable() {

- @Override

- public void run() {

- // Now reload the page while the popup is showing, it gets hidden.

- getActivity().getActiveShell().loadUrl(SELECT_URL);

- }

- });

- onPageFinishedHelper.waitForCallback(currentCallCount, 1,

- WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);

- // The popup should be hidden after the page reload.

- assertTrue("The select popup did not hide after reload.",

- CriteriaHelper.pollForCriteria(new PopupHiddenCriteria()));

- // Click the select and wait for the popup to show.

- DOMUtils.clickNode(this, view, viewClient, "select");

- assertTrue("The select popup did not show on click after reload.",

- CriteriaHelper.pollForCriteria(new PopupShowingCriteria()));

- }