content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java - Issue 886993003: Revert #315148 "[Android] Convert ContentShellTest.apk to isolate."

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

Issue 886993003: Revert #315148 "[Android] Convert ContentShellTest.apk to isolate." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « content/content_shell_test_apk.isolate ('k') | content/public/android/javatests/src/org/chromium/content/browser/ClickListenerTest.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/AddressDetectionTest.java

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

index cdb2c53967c00ffb03fd17513a9af2275b60afbb..3b6bc809a1ecaec6382b4dbb51e424a2c58c02e3 100644

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

+++ b/content/public/android/javatests/src/org/chromium/content/browser/AddressDetectionTest.java

@@ -24,8 +24,7 @@ public class AddressDetectionTest extends ContentDetectionTestBase {

@MediumTest

@Feature({"ContentDetection", "TabContents"})

public void testMultipleAddressesInText() throws Throwable {

- startActivityWithTestUrl(

- "content/test/data/android/content_detection/geo_address_multiple.html");

+ startActivityWithTestUrl("content/content_detection/geo_address_multiple.html");

assertWaitForPageScaleFactorMatch(1.0f);

assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),

@@ -38,8 +37,7 @@ public class AddressDetectionTest extends ContentDetectionTestBase {

@MediumTest

@Feature({"ContentDetection", "TabContents"})

public void testSplitAddresses() throws Throwable {

- startActivityWithTestUrl(

- "content/test/data/android/content_detection/geo_address_split.html");

+ startActivityWithTestUrl("content/content_detection/geo_address_split.html");

assertWaitForPageScaleFactorMatch(1.0f);

assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),

@@ -58,8 +56,7 @@ public class AddressDetectionTest extends ContentDetectionTestBase {

@MediumTest

@Feature({"ContentDetection", "TabContents"})

public void testAddressLimits() throws Throwable {

- startActivityWithTestUrl(

- "content/test/data/android/content_detection/geo_address_limits.html");

+ startActivityWithTestUrl("content/content_detection/geo_address_limits.html");

assertWaitForPageScaleFactorMatch(1.0f);

assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),

@@ -78,8 +75,7 @@ public class AddressDetectionTest extends ContentDetectionTestBase {

@MediumTest

@Feature({"ContentDetection", "TabContents"})

public void testRealAddresses() throws Throwable {

- startActivityWithTestUrl(

- "content/test/data/android/content_detection/geo_address_real.html");

+ startActivityWithTestUrl("content/content_detection/geo_address_real.html");

assertWaitForPageScaleFactorMatch(1.0f);

assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),

@@ -98,8 +94,7 @@ public class AddressDetectionTest extends ContentDetectionTestBase {

@MediumTest

@Feature({"ContentDetection", "TabContents"})

public void testSpecialChars() throws Throwable {

- startActivityWithTestUrl(

- "content/test/data/android/content_detection/geo_address_special_chars.html");

+ startActivityWithTestUrl("content/content_detection/geo_address_special_chars.html");

assertWaitForPageScaleFactorMatch(1.0f);

assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),