chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java - Issue 2815453003: Create ChromeActivityTestRule for converting JUnit4 tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Issue 2815453003: Create ChromeActivityTestRule for converting JUnit4 tests (Closed)

Patch Set: nits and rebase Created 3 years, 8 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 | « base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.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/customtabs/CustomTabActivityTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

index 4358804f03091c0ab685ea5a1a58f08bb5f221a9..9d668a504a921c0f6eb277e03bba0a1e62172848 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

@@ -1584,7 +1584,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {

assertNotNull("Main activity did not start", activity);

ChromeTabbedActivity tabbedActivity =

(ChromeTabbedActivity) monitor.waitForActivityWithTimeout(

- ACTIVITY_START_TIMEOUT_MS);

+ getActivityStartTimeoutMs());

assertNotNull("ChromeTabbedActivity did not start", tabbedActivity);

assertNotNull("Should have a tab switcher button.",

tabbedActivity.findViewById(R.id.tab_switcher_button));