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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java

Issue 878163004: [Android] Convert ContentShellTest.apk to isolate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad rebase Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.java
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 3ea92755834bb6fff23cbd782aff74015de6002e..2c57e8143aa8a361c1c0a68db5477d0a00628c27 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
@@ -16,34 +16,37 @@ public class ClickListenerTest extends ContentDetectionTestBase {
@MediumTest
@Feature({"ContentDetection", "TabContents"})
public void testClickContentOnLink() throws Throwable {
- startActivityWithTestUrl("content/content_detection/click_listeners.html");
+ startActivityWithTestUrl(
+ "content/test/data/android/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"));
+ assertTrue(isCurrentTestUrl("content/test/data/android/content_detection/empty.html"));
}
@MediumTest
@Feature({"ContentDetection", "TabContents"})
public void testClickContentOnJSListener1() throws Throwable {
- startActivityWithTestUrl("content/content_detection/click_listeners.html");
+ startActivityWithTestUrl(
+ "content/test/data/android/content_detection/click_listeners.html");
assertWaitForPageScaleFactorMatch(1.0f);
// Clicks on addresses in elements listening to click events should be
// processed normally without address detection.
scrollAndTapNavigatingOut("clicktest1");
- assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
+ assertTrue(isCurrentTestUrl("content/test/data/android/content_detection/empty.html"));
}
@MediumTest
@Feature({"ContentDetection", "TabContents"})
public void testClickContentOnJSListener2() throws Throwable {
- startActivityWithTestUrl("content/content_detection/click_listeners.html");
+ startActivityWithTestUrl(
+ "content/test/data/android/content_detection/click_listeners.html");
assertWaitForPageScaleFactorMatch(1.0f);
// Same as previous test, but using addEventListener instead of onclick.
scrollAndTapNavigatingOut("clicktest2");
- assertTrue(isCurrentTestUrl("content/content_detection/empty.html"));
+ assertTrue(isCurrentTestUrl("content/test/data/android/content_detection/empty.html"));
}
}

Powered by Google App Engine
This is Rietveld 408576698