forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
No change to production logic. This switches every use of BaseJUnit4ClassRunner to AwJUnit4ClassRunner under android_webview/javatests/. This also adds @SkipCommandLineParameterization for each change, because the BaseJUnit4ClassRunner did not run tests in both single & multiprocess mode, only in single process mode (so we keep the same behavior). This also adds a presubmit to prevent regressions. Proposed on: http://shortn/_OS7nGlyaOn Test: manually test presubmit prevents me from adding a test suite with BaseJUnit4ClassRunner Test: run_webview_instrumentation_test_apk (everything passes, and the same number of tests are run as before this CL) Change-Id: I36c0e549b1987cd1241407d989a2135f4d932a53 Reviewed-on: https://chromium-review.googlesource.com/1184234 Reviewed-by: Bo <boliu@chromium.org> Commit-Queue: Nate Fischer <ntfschr@chromium.org> Cr-Commit-Position: refs/heads/master@{#585253}
- Loading branch information
1 parent
43f932e
commit 44b83b9
Showing
12 changed files
with
75 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# Copyright 2018 The Chromium Authors. All rights reserved. | ||
# Use of this source code is governed by a BSD-style license that can be | ||
# found in the LICENSE file. | ||
"""Presubmit tests for android_webview/javatests/ | ||
Runs various style checks before upload. | ||
""" | ||
|
||
def CheckChangeOnUpload(input_api, output_api): | ||
results = [] | ||
results.extend(_CheckAwJUnitTestRunner(input_api, output_api)) | ||
return results | ||
|
||
def _CheckAwJUnitTestRunner(input_api, output_api): | ||
"""Checks that new tests use the AwJUnit4ClassRunner instead of some other | ||
test runner. This is because WebView has special logic in the | ||
AwJUnit4ClassRunner. | ||
""" | ||
|
||
run_with_pattern = input_api.re.compile( | ||
r'^@RunWith\((.*)\)$') | ||
correct_runner = 'AwJUnit4ClassRunner.class' | ||
|
||
errors = [] | ||
|
||
def _FilterFile(affected_file): | ||
return input_api.FilterSourceFile( | ||
affected_file, | ||
black_list=input_api.DEFAULT_BLACK_LIST, | ||
white_list=[r'.*\.java$']) | ||
|
||
for f in input_api.AffectedSourceFiles(_FilterFile): | ||
for line_num, line in f.ChangedContents(): | ||
match = run_with_pattern.search(line) | ||
if match and match.group(1) != correct_runner: | ||
errors.append("%s:%d" % (f.LocalPath(), line_num)) | ||
|
||
results = [] | ||
|
||
if errors: | ||
results.append(output_api.PresubmitPromptWarning(""" | ||
android_webview/javatests/ should use the AwJUnit4ClassRunner test runner, not | ||
any other test runner (e.g., BaseJUnit4ClassRunner). | ||
""", | ||
errors)) | ||
|
||
return results |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters