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

Side by Side Diff: content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.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 junit.framework.Assert; 9 import junit.framework.Assert;
10 10
11 import org.chromium.base.test.util.DisabledTest;
11 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
12 import org.chromium.content.browser.test.util.Criteria; 13 import org.chromium.content.browser.test.util.Criteria;
13 import org.chromium.content.browser.test.util.CriteriaHelper; 14 import org.chromium.content.browser.test.util.CriteriaHelper;
14 import org.chromium.content.browser.test.util.DOMUtils; 15 import org.chromium.content.browser.test.util.DOMUtils;
15 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; 16 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
16 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper; 17 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPage FinishedHelper;
17 import org.chromium.content_shell.ContentShellTestBase; 18 import org.chromium.content_shell.ContentShellTestBase;
18 19
19 import java.util.concurrent.TimeUnit; 20 import java.util.concurrent.TimeUnit;
20 21
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 77
77 // After the click, the text on the page should say "clicked". 78 // After the click, the text on the page should say "clicked".
78 assertTrue("The page contents didn't change after a click " + disambigua tion, 79 assertTrue("The page contents didn't change after a click " + disambigua tion,
79 CriteriaHelper.pollForCriteria(new NodeContentsIsEqualToCriteria ( 80 CriteriaHelper.pollForCriteria(new NodeContentsIsEqualToCriteria (
80 view, viewClient, "test", "clicked"))); 81 view, viewClient, "test", "clicked")));
81 } 82 }
82 83
83 /** 84 /**
84 * Tests that showing a select popup and having the page reload while the po pup is showing does 85 * Tests that showing a select popup and having the page reload while the po pup is showing does
85 * not assert. 86 * not assert.
87 *
88 * @LargeTest
89 * @Feature({"Browser"})
90 * BUG 172967
86 */ 91 */
87 @LargeTest 92 @DisabledTest
88 @Feature({"Browser"})
89 public void testSeparateClicksAreRegisteredOnReload() 93 public void testSeparateClicksAreRegisteredOnReload()
90 throws InterruptedException, Exception, Throwable { 94 throws InterruptedException, Exception, Throwable {
91 // Load the test page. 95 // Load the test page.
92 launchContentShellWithUrl(CLICK_TEST_URL); 96 launchContentShellWithUrl(CLICK_TEST_URL);
93 assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading()); 97 assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
94 98
95 final ContentView view = getActivity().getActiveContentView(); 99 final ContentView view = getActivity().getActiveContentView();
96 final TestCallbackHelperContainer viewClient = 100 final TestCallbackHelperContainer viewClient =
97 new TestCallbackHelperContainer(view); 101 new TestCallbackHelperContainer(view);
98 final OnPageFinishedHelper onPageFinishedHelper = 102 final OnPageFinishedHelper onPageFinishedHelper =
(...skipping 25 matching lines...) Expand all
124 new LoadUrlParams(CLICK_TEST_URL)); 128 new LoadUrlParams(CLICK_TEST_URL));
125 } 129 }
126 }); 130 });
127 onPageFinishedHelper.waitForCallback(currentCallCount, 1, 131 onPageFinishedHelper.waitForCallback(currentCallCount, 1,
128 WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS); 132 WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
129 133
130 // Test that the button click still works. 134 // Test that the button click still works.
131 verifyClicksAreRegistered("after direct navigation", view, viewClient); 135 verifyClicksAreRegistered("after direct navigation", view, viewClient);
132 } 136 }
133 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698