(Reland) Update all Robolectric tests to Robolectric 3.0
BUG=522043 Review-Url: https://codereview.chromium.org/2243353002 Cr-Original-Commit-Position: refs/heads/master@{#412564} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: cf5bc93dae70d15f712f45daf2fb2d696d8241ad
This commit is contained in:
Родитель
9a1647ec81
Коммит
20c8784559
|
@ -46,6 +46,12 @@ class JavaTestRunner(object):
|
|||
|
||||
# Add JVM arguments.
|
||||
jvm_args = []
|
||||
# TODO(mikecase): Add a --robolectric-dep-dir arg to test runner.
|
||||
# Have this arg set by GN in the generated test runner scripts.
|
||||
jvm_args += [
|
||||
'-Drobolectric.dependency.dir=%s' %
|
||||
os.path.join(constants.GetOutDirectory(),
|
||||
'lib.java', 'third_party', 'robolectric')]
|
||||
if self._coverage_dir:
|
||||
if not os.path.exists(self._coverage_dir):
|
||||
os.makedirs(self._coverage_dir)
|
||||
|
|
|
@ -1123,13 +1123,17 @@ if (enable_java_templates) {
|
|||
bypass_platform_checks = true
|
||||
main_class = "org.chromium.testing.local.JunitTestMain"
|
||||
wrapper_script_name = "helper/$target_name"
|
||||
|
||||
deps += [
|
||||
"//testing/android/junit:junit_test_support",
|
||||
"//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",
|
||||
]
|
||||
}
|
||||
group(target_name) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче