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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2766393004: Convert most of the rest of instrumentation tests in content (Closed)
Patch Set: Keep @CommenLineFlags Created 3 years, 9 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/BUILD.gn ('k') | content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeActivityTestRule.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 88ec026ffb65455af02ad78983064b3a0e503751..559d3cd64c42179c2cfb97394877bc2d4c17fb1e 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
@@ -6,6 +6,12 @@ package org.chromium.content.browser;
import android.support.test.filters.MediumTest;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
@@ -15,102 +21,128 @@ import org.chromium.content.common.ContentSwitches;
/**
* Test suite for geographical US address detection.
*/
+@RunWith(BaseJUnit4ClassRunner.class)
@CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
-public class AddressDetectionTest extends ContentDetectionTestBase {
+public class AddressDetectionTest {
+ @Rule
+ public ContentDetectionActivityTestRule mActivityTestRule =
+ new ContentDetectionActivityTestRule();
private static final String GEO_INTENT_PREFIX = "geo:0,0?q=";
private boolean isExpectedGeoIntent(String intentUrl, String expectedContent) {
if (intentUrl == null) return false;
- final String expectedUrl = GEO_INTENT_PREFIX + urlForContent(expectedContent);
+ final String expectedUrl =
+ GEO_INTENT_PREFIX + mActivityTestRule.urlForContent(expectedContent);
return intentUrl.equals(expectedUrl);
}
+ @Test
@MediumTest
@Feature({"ContentDetection", "TabContents"})
@RetryOnFailure
public void testMultipleAddressesInText() throws Throwable {
- startActivityWithTestUrl(
+ mActivityTestRule.launchContentShellWithUrlSync(
"content/test/data/android/content_detection/geo_address_multiple.html");
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),
- "1600 Amphitheatre Parkway Mountain View, CA 94043"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test1"),
+ "1600 Amphitheatre Parkway Mountain View, CA 94043"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test2"),
- "76 Ninth Avenue 4th Floor New York, NY 10011"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test2"),
+ "76 Ninth Avenue 4th Floor New York, NY 10011"));
}
+ @Test
@MediumTest
@Feature({"ContentDetection", "TabContents"})
@RetryOnFailure
public void testSplitAddresses() throws Throwable {
- startActivityWithTestUrl(
+ mActivityTestRule.launchContentShellWithUrlSync(
"content/test/data/android/content_detection/geo_address_split.html");
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),
- "9606 North MoPac Expressway Suite 400 Austin, TX 78759"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test1"),
+ "9606 North MoPac Expressway Suite 400 Austin, TX 78759"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test2"),
- "1818 Library Street Suite 400, VA 20190"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test2"),
+ "1818 Library Street Suite 400, VA 20190"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test3"),
- "1818 Library Street Suite 400, VA 20190"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test3"),
+ "1818 Library Street Suite 400, VA 20190"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test4"),
- "1818 Library Street Suite 400, VA 20190"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test4"),
+ "1818 Library Street Suite 400, VA 20190"));
}
//@MediumTest
//@Feature({"ContentDetection", "TabContents"})
+ @Test
@DisabledTest
public void testAddressLimits() throws Throwable {
- startActivityWithTestUrl(
+ mActivityTestRule.launchContentShellWithUrlSync(
"content/test/data/android/content_detection/geo_address_limits.html");
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),
- "2590 Pearl Street Suite 100 Boulder, CO 80302"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test1"),
+ "2590 Pearl Street Suite 100 Boulder, CO 80302"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test2"),
- "6425 Penn Ave. Suite 700 Pittsburgh, PA 15206"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test2"),
+ "6425 Penn Ave. Suite 700 Pittsburgh, PA 15206"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test3"),
- "34 Main St. Boston, MA 02118"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test3"),
+ "34 Main St. Boston, MA 02118"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test4"),
- "1600 Amphitheatre Parkway Mountain View, CA 94043"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test4"),
+ "1600 Amphitheatre Parkway Mountain View, CA 94043"));
}
+ @Test
@MediumTest
@Feature({"ContentDetection", "TabContents"})
@RetryOnFailure
public void testRealAddresses() throws Throwable {
- startActivityWithTestUrl(
+ mActivityTestRule.launchContentShellWithUrlSync(
"content/test/data/android/content_detection/geo_address_real.html");
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),
- "57th Street and Lake Shore Drive Chicago, IL 60637"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test1"),
+ "57th Street and Lake Shore Drive Chicago, IL 60637"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test2"),
- "57th Street and Lake Shore Drive Chicago, IL 60637"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test2"),
+ "57th Street and Lake Shore Drive Chicago, IL 60637"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test3"),
- "57th Street and Lake Shore Drive Chicago, IL 60637"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test3"),
+ "57th Street and Lake Shore Drive Chicago, IL 60637"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test4"),
- "79th Street, New York, NY, 10024-5192"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test4"),
+ "79th Street, New York, NY, 10024-5192"));
}
+ @Test
@MediumTest
@Feature({"ContentDetection", "TabContents"})
@RetryOnFailure
public void testSpecialChars() throws Throwable {
- startActivityWithTestUrl(
+ mActivityTestRule.launchContentShellWithUrlSync(
"content/test/data/android/content_detection/geo_address_special_chars.html");
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test1"),
- "100 34th Avenue , San Francisco, CA 94121"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test1"),
+ "100 34th Avenue , San Francisco, CA 94121"));
- assertTrue(isExpectedGeoIntent(scrollAndTapExpectingIntent("test2"),
- "100 34th Avenue San Francisco, CA 94121"));
+ Assert.assertTrue(
+ isExpectedGeoIntent(mActivityTestRule.scrollAndTapExpectingIntent("test2"),
+ "100 34th Avenue San Francisco, CA 94121"));
}
}
« no previous file with comments | « content/public/android/BUILD.gn ('k') | content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeActivityTestRule.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698