testing/android/junit/BUILD.gn - Issue 2243353002: (Reland) Update all Robolectric tests to Robolectric 3.0

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: testing/android/junit/BUILD.gn

Issue 2243353002: (Reland) Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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 | « net/android/junit/src/org/chromium/net/HttpNegotiateAuthenticatorTest.java ('k') | testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: testing/android/junit/BUILD.gn

diff --git a/testing/android/junit/BUILD.gn b/testing/android/junit/BUILD.gn

index 328f0523a9428d1264cb893d62187348cb374b3b..0c11c3b56754e732bb7a8c5e98169e09cbe9864b 100644

--- a/testing/android/junit/BUILD.gn

+++ b/testing/android/junit/BUILD.gn

@@ -22,14 +22,18 @@ java_library("junit_test_support") {

"java/src/org/chromium/testing/local/JunitTestMain.java",

"java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java",

"java/src/org/chromium/testing/local/PackageFilter.java",

- "java/src/org/chromium/testing/local/RobolectricClasspathDependencyResolver.java",

"java/src/org/chromium/testing/local/RunnerFilter.java",

]

deps = [

"//third_party/junit",

"//third_party/mockito:mockito_java",

- "//third_party/robolectric:android-all-4.3_r2-robolectric-0",

+ "//third_party/robolectric:android-all-5.0.0_r2-robolectric-1",

+ "//third_party/robolectric:robolectric_annotations_java",

"//third_party/robolectric:robolectric_java",

+ "//third_party/robolectric:robolectric_resources_java",

+ "//third_party/robolectric:robolectric_utils_java",

+ "//third_party/robolectric:shadows-core-3.0-21",

+ "//third_party/robolectric:shadows-multidex-3.0",

]

}