diff options
| author | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 19:57:05 +0000 |
|---|---|---|
| committer | aruslan@chromium.org <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 19:57:05 +0000 |
| commit | 061640b32aca7ec9a080dd2a29ce3b01e8ee118d (patch) | |
| tree | c7967acb388dde5c5290a81821222e5da89f6897 /content | |
| parent | 6a6f276d6b89a4f96b5f5265de0ff62fbcc27a50 (diff) | |
| download | chromium_src-061640b32aca7ec9a080dd2a29ce3b01e8ee118d.zip chromium_src-061640b32aca7ec9a080dd2a29ce3b01e8ee118d.tar.gz chromium_src-061640b32aca7ec9a080dd2a29ce3b01e8ee118d.tar.bz2 | |
Enable ClickListenerTest.
Accidentally left disabled when the underlying issue was resolved.
BUG=172786,156800
Review URL: https://codereview.chromium.org/118333004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java | 19 | ||||
| -rw-r--r-- | content/test/data/android/device_files/content_detection/click_listeners.html | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java index 2f8f9c0..3ea9275 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java @@ -4,35 +4,31 @@ package org.chromium.content.browser; -import org.chromium.base.test.util.DisabledTest; +import android.test.suitebuilder.annotation.MediumTest; + +import org.chromium.base.test.util.Feature; /** * Test suite for click listener validation in content detection. */ public class ClickListenerTest extends ContentDetectionTestBase { - /* @MediumTest @Feature({"ContentDetection", "TabContents"}) - http://crbug.com/172786 - */ - @DisabledTest public void testClickContentOnLink() throws Throwable { startActivityWithTestUrl("content/content_detection/click_listeners.html"); + assertWaitForPageScaleFactorMatch(1.0f); // Clicks on addresses in links should change the url. scrollAndTapNavigatingOut("linktest"); assertTrue(isCurrentTestUrl("content/content_detection/empty.html")); } - /* @MediumTest @Feature({"ContentDetection", "TabContents"}) - http://crbug.com/172786 - */ - @DisabledTest public void testClickContentOnJSListener1() throws Throwable { startActivityWithTestUrl("content/content_detection/click_listeners.html"); + assertWaitForPageScaleFactorMatch(1.0f); // Clicks on addresses in elements listening to click events should be // processed normally without address detection. @@ -40,14 +36,11 @@ public class ClickListenerTest extends ContentDetectionTestBase { assertTrue(isCurrentTestUrl("content/content_detection/empty.html")); } - /* @MediumTest @Feature({"ContentDetection", "TabContents"}) - http://crbug.com/172786 - */ - @DisabledTest public void testClickContentOnJSListener2() throws Throwable { startActivityWithTestUrl("content/content_detection/click_listeners.html"); + assertWaitForPageScaleFactorMatch(1.0f); // Same as previous test, but using addEventListener instead of onclick. scrollAndTapNavigatingOut("clicktest2"); diff --git a/content/test/data/android/device_files/content_detection/click_listeners.html b/content/test/data/android/device_files/content_detection/click_listeners.html index e9beef0..b4fd5104 100644 --- a/content/test/data/android/device_files/content_detection/click_listeners.html +++ b/content/test/data/android/device_files/content_detection/click_listeners.html @@ -6,7 +6,7 @@ <body> Blah blah <a href="empty.html">Excepteur sint 1818 Library Street <span id="linktest">Suite</span> 400, VA 20190 occaecat cupidatat</a><br> -<!-- Click listeners --!> +<!-- Click listeners --> <span onclick="javascript:window.location.href='empty.html'"> blah 1818 <span id="clicktest1">Library</span> Street <br> Suite 400, VA 20190 blah <br> |