Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1634)

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

Issue 14100003: [Android] Moving input related files to a separate input/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/test/SelectPopupOtherContentViewTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/SelectPopupOtherContentViewTest.java
deleted file mode 100644
index ce4a7a51db99b6c7dcef144de596c8e1d2a6ff4c..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/SelectPopupOtherContentViewTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// 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;
-
-import android.test.suitebuilder.annotation.LargeTest;
-
-import org.chromium.base.test.util.DisabledTest;
-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.SelectPopupDialog;
-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.UiUtils;
-import org.chromium.chrome.browser.ContentViewUtil;
-import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
-import org.chromium.ui.gfx.ActivityNativeWindow;
-
-import java.util.concurrent.TimeUnit;
-
-public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {
- private static final int WAIT_TIMEOUT_SECONDS = 2;
- 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 static class PopupShowingCriteria implements Criteria {
- @Override
- public boolean isSatisfied() {
- return SelectPopupDialog.getCurrent() != 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.
- launchChromiumTestShellWithUrl(SELECT_URL);
- assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
-
- final ContentView view = getActivity().getActiveContentView();
- final TestCallbackHelperContainer viewClient =
- new TestCallbackHelperContainer(view);
-
- // 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()));
-
- // Now create and destroy a different ContentView.
- UiUtils.runOnUiThread(getActivity(), new Runnable() {
- @Override
- public void run() {
- int nativeWebContents = ContentViewUtil.createNativeWebContents(false);
- ActivityNativeWindow nativeWindow = new ActivityNativeWindow(getActivity());
- ContentView contentView = ContentView.newInstance(
- getActivity(), nativeWebContents,
- nativeWindow, ContentView.PERSONALITY_CHROME);
- contentView.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.",
- SelectPopupDialog.getCurrent());
- }
-}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/test/AutofillTest.java ('k') | content/content_jni.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698