chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java - Issue 1223323012: Shore up application testing procedures

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java

Issue 1223323012: Shore up application testing procedures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Adding function to avoid breaking downstream Created 5 years, 5 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 | « chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeRecentlyClosedTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java

index 37115c1024b700f6b200657d051d72b25e2fc37f..578a8c3fe629de907bda225d90eefbf89e3533e6 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeReferrerTest.java

@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.Tab;

import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;

import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;

+import org.chromium.chrome.test.util.ApplicationTestUtils;

import org.chromium.chrome.test.util.DisableInTabbedMode;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

@@ -47,7 +48,7 @@ public class DocumentModeReferrerTest extends DocumentModeTestBase {

public void testReferrerExtra() throws Exception {

Instrumentation.ActivityMonitor monitor = getInstrumentation().addMonitor(

DocumentActivity.class.getName(), null, false);

- launchMainIntent(mContext);

+ ApplicationTestUtils.launchChrome(mContext);

// Wait for tab model to become initialized.

assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {

@@ -99,7 +100,7 @@ public class DocumentModeReferrerTest extends DocumentModeTestBase {

public void testReferrerExtraAndroidApp() throws Exception {

Instrumentation.ActivityMonitor monitor = getInstrumentation().addMonitor(

DocumentActivity.class.getName(), null, false);

- launchMainIntent(mContext);

+ ApplicationTestUtils.launchChrome(mContext);

// Wait for tab model to become initialized.

assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {

@@ -151,7 +152,7 @@ public class DocumentModeReferrerTest extends DocumentModeTestBase {

public void testReferrerExtraNotAndroidApp() throws Exception {

Instrumentation.ActivityMonitor monitor = getInstrumentation().addMonitor(

DocumentActivity.class.getName(), null, false);

- launchMainIntent(mContext);

+ ApplicationTestUtils.launchChrome(mContext);

// Wait for tab model to become initialized.

assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {

@@ -204,7 +205,7 @@ public class DocumentModeReferrerTest extends DocumentModeTestBase {

public void testReferrerExtraFromExternalIntent() throws Exception {

Instrumentation.ActivityMonitor monitor = getInstrumentation().addMonitor(

DocumentActivity.class.getName(), null, false);

- launchMainIntent(mContext);

+ ApplicationTestUtils.launchChrome(mContext);

// Wait for tab model to become initialized.

assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {