content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.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/GestureDetectorResetTest.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/EncodeHtmlDataUriTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.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/GestureDetectorResetTest.java

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

deleted file mode 100644

index fa92e2c83afdd848a19d95539f09c863f1b3be8f..0000000000000000000000000000000000000000

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

+++ /dev/null

@@ -1,136 +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;

-import junit.framework.Assert;

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

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

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

-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 GestureDetectorResetTest extends ContentShellTestBase {

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

- private static final String CLICK_TEST_URL = UrlUtils.encodeHtmlDataUri(

- "<html><body>" +

- "<button id=\"button\" " +

- " onclick=\"document.getElementById('test').textContent = 'clicked';\">" +

- "Button" +

- "</button><br/>" +

- "<div id=\"test\">not clicked</div><br/>" +

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

- private static class NodeContentsIsEqualToCriteria implements Criteria {

- private final ContentView mView;

- private final TestCallbackHelperContainer mViewClient;

- private final String mNodeId;

- private final String mExpectedContents;

- public NodeContentsIsEqualToCriteria(

- ContentView view,

- TestCallbackHelperContainer viewClient,

- String nodeId, String expectedContents) {

- mView = view;

- mViewClient = viewClient;

- mNodeId = nodeId;

- mExpectedContents = expectedContents;

- assert mExpectedContents != null;

- }

- @Override

- public boolean isSatisfied() {

- try {

- String contents = DOMUtils.getNodeContents(mView, mViewClient, mNodeId);

- return mExpectedContents.equals(contents);

- } catch (Throwable e) {

- Assert.fail("Failed to retrieve node contents: " + e);

- return false;

- }

- public GestureDetectorResetTest() {

- }

- private void verifyClicksAreRegistered(

- String disambiguation,

- ContentView view, TestCallbackHelperContainer viewClient)

- throws InterruptedException, Exception, Throwable {

- // Initially the text on the page should say "not clicked".

- assertTrue("The page contents is invalid " + disambiguation,

- CriteriaHelper.pollForCriteria(new NodeContentsIsEqualToCriteria(

- view, viewClient, "test", "not clicked")));

- // Click the button.

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

- // After the click, the text on the page should say "clicked".

- assertTrue("The page contents didn't change after a click " + disambiguation,

- CriteriaHelper.pollForCriteria(new NodeContentsIsEqualToCriteria(

- view, viewClient, "test", "clicked")));

- }

- /**

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

- * not assert.

- *

- * @LargeTest

- * @Feature({"Browser"})

- * BUG 172967

- */

- @DisabledTest

- public void testSeparateClicksAreRegisteredOnReload()

- throws InterruptedException, Exception, Throwable {

- // Load the test page.

- launchContentShellWithUrl(CLICK_TEST_URL);

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

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

- final TestCallbackHelperContainer viewClient =

- new TestCallbackHelperContainer(view);

- final OnPageFinishedHelper onPageFinishedHelper =

- viewClient.getOnPageFinishedHelper();

- // Test that the button click works.

- verifyClicksAreRegistered("on initial load", view, viewClient);

- // Reload the test page.

- int currentCallCount = onPageFinishedHelper.getCallCount();

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

- @Override

- public void run() {

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

- }

- });

- onPageFinishedHelper.waitForCallback(currentCallCount, 1,

- WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);

- // Test that the button click still works.

- verifyClicksAreRegistered("after reload", view, viewClient);

- // Directly navigate to the test page.

- currentCallCount = onPageFinishedHelper.getCallCount();

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

- @Override

- public void run() {

- getActivity().getActiveShell().getContentView().loadUrl(

- new LoadUrlParams(CLICK_TEST_URL));

- }

- });

- onPageFinishedHelper.waitForCallback(currentCallCount, 1,

- WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);

- // Test that the button click still works.

- verifyClicksAreRegistered("after direct navigation", view, viewClient);

- }