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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/SelectPopupTest.java

Issue 12045002: Delete zoomed_viewport_offset_ and its users. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add imports for DisabledTest and rebase to 179449 Created 7 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.content.browser; 5 package org.chromium.content.browser;
6 6
7 import android.test.suitebuilder.annotation.LargeTest; 7 import android.test.suitebuilder.annotation.LargeTest;
8 8
9 import org.chromium.base.test.util.DisabledTest;
9 import org.chromium.base.test.util.Feature; 10 import org.chromium.base.test.util.Feature;
10 import org.chromium.content.browser.test.util.Criteria; 11 import org.chromium.content.browser.test.util.Criteria;
11 import org.chromium.content.browser.test.util.CriteriaHelper; 12 import org.chromium.content.browser.test.util.CriteriaHelper;
12 import org.chromium.content.browser.test.util.DOMUtils; 13 import org.chromium.content.browser.test.util.DOMUtils;
13 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; 14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
14 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper; 15 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper;
15 import org.chromium.content_shell.ContentShellTestBase; 16 import org.chromium.content_shell.ContentShellTestBase;
16 17
17 import java.util.concurrent.TimeUnit; 18 import java.util.concurrent.TimeUnit;
18 19
(...skipping 26 matching lines...) Expand all
45 return SelectPopupDialog.getCurrent() == null; 46 return SelectPopupDialog.getCurrent() == null;
46 } 47 }
47 } 48 }
48 49
49 public SelectPopupTest() { 50 public SelectPopupTest() {
50 } 51 }
51 52
52 /** 53 /**
53 * Tests that showing a select popup and having the page reload while the po pup is showing does 54 * Tests that showing a select popup and having the page reload while the po pup is showing does
54 * not assert. 55 * not assert.
56 * @LargeTest
57 * @Feature({"Browser"})
58 * BUG 172967
55 */ 59 */
56 @LargeTest 60 @DisabledTest
57 @Feature({"Browser"})
58 public void testReloadWhilePopupShowing() throws InterruptedException, Excep tion, Throwable { 61 public void testReloadWhilePopupShowing() throws InterruptedException, Excep tion, Throwable {
59 // Load the test page. 62 // Load the test page.
60 launchContentShellWithUrl(SELECT_URL); 63 launchContentShellWithUrl(SELECT_URL);
61 assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading()); 64 assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
62 65
63 // The popup should be hidden before the click. 66 // The popup should be hidden before the click.
64 assertTrue("The select popup is shown after load.", 67 assertTrue("The select popup is shown after load.",
65 CriteriaHelper.pollForCriteria(new PopupHiddenCriteria())); 68 CriteriaHelper.pollForCriteria(new PopupHiddenCriteria()));
66 69
67 final ContentView view = getActivity().getActiveContentView(); 70 final ContentView view = getActivity().getActiveContentView();
(...skipping 22 matching lines...) Expand all
90 // The popup should be hidden after the page reload. 93 // The popup should be hidden after the page reload.
91 assertTrue("The select popup did not hide after reload.", 94 assertTrue("The select popup did not hide after reload.",
92 CriteriaHelper.pollForCriteria(new PopupHiddenCriteria())); 95 CriteriaHelper.pollForCriteria(new PopupHiddenCriteria()));
93 96
94 // Click the select and wait for the popup to show. 97 // Click the select and wait for the popup to show.
95 DOMUtils.clickNode(this, view, viewClient, "select"); 98 DOMUtils.clickNode(this, view, viewClient, "select");
96 assertTrue("The select popup did not show on click after reload.", 99 assertTrue("The select popup did not show on click after reload.",
97 CriteriaHelper.pollForCriteria(new PopupShowingCriteria())); 100 CriteriaHelper.pollForCriteria(new PopupShowingCriteria()));
98 } 101 }
99 } 102 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698