chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java - Issue 1139643006: Rename chrome/android/javatests to javatests_shell.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

Issue 1139643006: Rename chrome/android/javatests to javatests_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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 | « chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/IntentSavingContext.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

deleted file mode 100644

index 2989bfd0b0d156fab7c1fee10cb2badb03a81e26..0000000000000000000000000000000000000000

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java

+++ /dev/null

@@ -1,93 +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.chrome.browser.input;

-import org.chromium.base.ThreadUtils;

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

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

-import org.chromium.chrome.browser.ContentViewUtil;

-import org.chromium.chrome.shell.ChromeShellTestBase;

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

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

-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_public.browser.WebContents;

-import org.chromium.ui.base.ActivityWindowAndroid;

-import org.chromium.ui.base.WindowAndroid;

-/**

- * Test the select popup and how it interacts with another ContentViewCore.

- */

-public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {

- private static final String SELECT_URL = UrlUtils.encodeHtmlDataUri(

- "<html><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 class PopupShowingCriteria implements Criteria {

- @Override

- public boolean isSatisfied() {

- ContentViewCore contentViewCore = getActivity().getActiveContentViewCore();

- return contentViewCore.getSelectPopupForTest() != null;

- }

- public SelectPopupOtherContentViewTest() {

- }

- /**

- * Tests that the showing select popup does not get closed because an unrelated ContentView

- * gets destroyed.

- *

- * @LargeTest

- * @Feature({"Browser"})

- * BUG 172967

- */

- @DisabledTest

- public void testPopupNotClosedByOtherContentView()

- throws InterruptedException, Exception, Throwable {

- // Load the test page.

- launchChromeShellWithUrl(SELECT_URL);

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

- final ContentViewCore viewCore = getActivity().getActiveContentViewCore();

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

- DOMUtils.clickNode(this, viewCore, "select");

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

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

- // Now create and destroy a different ContentView.

- ThreadUtils.runOnUiThreadBlocking(new Runnable() {

- @Override

- public void run() {

- WebContents webContents = ContentViewUtil.createWebContents(false, false);

- WindowAndroid windowAndroid = new ActivityWindowAndroid(getActivity());

- ContentViewCore contentViewCore = new ContentViewCore(getActivity());

- ContentView cv = new ContentView(getActivity(), contentViewCore);

- contentViewCore.initialize(cv, cv, webContents, windowAndroid);

- contentViewCore.destroy();

- }

- });

- // Process some more events to give a chance to the dialog to hide if it were to.

- getInstrumentation().waitForIdleSync();

- // The popup should still be shown.

- assertNotNull("The select popup got hidden by destroying of unrelated ContentViewCore.",

- viewCore.getSelectPopupForTest());

- }