diff options
Diffstat (limited to 'chromium/weblayer/browser/android/javatests')
4 files changed, 45 insertions, 15 deletions
diff --git a/chromium/weblayer/browser/android/javatests/BUILD.gn b/chromium/weblayer/browser/android/javatests/BUILD.gn index fccc34b09dc..e2da9b844b8 100644 --- a/chromium/weblayer/browser/android/javatests/BUILD.gn +++ b/chromium/weblayer/browser/android/javatests/BUILD.gn @@ -10,6 +10,7 @@ android_library("weblayer_java_tests") { testonly = true sources = [ "src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java", + "src/org/chromium/weblayer/test/BrowserTest.java", "src/org/chromium/weblayer/test/CookieManagerTest.java", "src/org/chromium/weblayer/test/CrashReporterTest.java", "src/org/chromium/weblayer/test/DataClearingTest.java", @@ -30,6 +31,7 @@ android_library("weblayer_java_tests") { "src/org/chromium/weblayer/test/OnTabRemovedTabListCallbackImpl.java", "src/org/chromium/weblayer/test/PrerenderControllerTest.java", "src/org/chromium/weblayer/test/ProfileTest.java", + "src/org/chromium/weblayer/test/RegisterExternalExperimentIdsTest.java", "src/org/chromium/weblayer/test/RenderingTest.java", "src/org/chromium/weblayer/test/ScrollOffsetCallbackTest.java", "src/org/chromium/weblayer/test/SmokeTest.java", @@ -68,11 +70,13 @@ android_library("weblayer_java_tests") { android_library("weblayer_private_java_tests") { testonly = true sources = [ + "src/org/chromium/weblayer/test/BrowserControlsOffsetCallbackTest.java", "src/org/chromium/weblayer/test/BrowserControlsTest.java", "src/org/chromium/weblayer/test/FullscreenCallbackPrivateTest.java", "src/org/chromium/weblayer/test/GeolocationTest.java", "src/org/chromium/weblayer/test/InfoBarTest.java", "src/org/chromium/weblayer/test/MediaCaptureTest.java", + "src/org/chromium/weblayer/test/MediaRouterTest.java", "src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java", "src/org/chromium/weblayer/test/PageInfoTest.java", "src/org/chromium/weblayer/test/PopupTest.java", @@ -87,6 +91,7 @@ android_library("weblayer_private_java_tests") { ":weblayer_java_test_support", "//base:base_java", "//base:base_java_test_support", + "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", "//net/android:net_java_test_support", "//third_party/android_deps:android_support_v4_java", @@ -98,6 +103,7 @@ android_library("weblayer_private_java_tests") { "//third_party/android_support_test_runner:runner_java", "//third_party/hamcrest:hamcrest_java", "//third_party/junit:junit", + "//ui/android:ui_java_test_support", "//weblayer/public/java", "//weblayer/public/javatestutil:test_java", "//weblayer/shell/android:weblayer_shell_java", @@ -195,7 +201,10 @@ weblayer_instrumentation("weblayer_support_instrumentation_test_apk") { weblayer_instrumentation("weblayer_private_instrumentation_test_apk") { apk_name = "WebLayerPrivateInstrumentationTest" apk_under_test = "//weblayer/shell/android:weblayer_shell_apk" - additional_apks = [ "//weblayer/shell/android:weblayer_support_apk" ] + additional_apks = [ + "//weblayer/shell/android:weblayer_support_apk", + "//components/media_router/test/android/media_router_test_support:media_router_test_support_apk", + ] deps = [ ":weblayer_private_java_tests" ] } diff --git a/chromium/weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py b/chromium/weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py index 0868a5d57fe..c29d3b21555 100755 --- a/chromium/weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py +++ b/chromium/weblayer/browser/android/javatests/skew/build_weblayer_instrumentation_test_cipd_pkg.py @@ -7,11 +7,12 @@ # Script to build a CIPD package for weblayer_instrumentation_test_apk from # the current Chromium checkout. # -# This should be run from the src directory of a release branch. After the -# package is built the user should run two cipd commands (printed at the end -# of script execution) to upload the package to the CIPD server and to update -# the ref for the corresponding milestone. Once the ref is updated, the version -# skew test will pick up the new package in successive runs. +# This should be run from the src directory of a release branch. This will +# take care of the build, you need not do that yourself. After the package is +# built run two cipd commands (printed at the end of script execution) to +# upload the package to the CIPD server and to update the ref for the +# corresponding milestone. Once the ref is updated, the version skew test will +# pick up the new package in successive runs. import argparse import contextlib @@ -138,7 +139,7 @@ def main(): print('Use "cipd set-ref chromium/testing/weblayer-x86 --version ' + '<CIPD instance version> -ref m<milestone>" to update the ref.') print('The CIPD instance version can be found on the "Instance" line ' + - 'above after "chromium/testing/weblayer-x86:".') + 'after "chromium/testing/weblayer-x86:".') if __name__ == '__main__': diff --git a/chromium/weblayer/browser/android/javatests/skew/mb_config.pyl b/chromium/weblayer/browser/android/javatests/skew/mb_config.pyl index 4ccb34ed67b..bcf334900bb 100644 --- a/chromium/weblayer/browser/android/javatests/skew/mb_config.pyl +++ b/chromium/weblayer/browser/android/javatests/skew/mb_config.pyl @@ -13,15 +13,19 @@ # instrumentation tests. { 'masters': { - 'dummy.master': { - 'dummy.builder': 'android_release_bot_minimal_symbols_x86_webview_google', - }, + 'dummy.group': { + 'dummy.builder.google_webview_pkg_name': 'android_weblayer_with_google_webview_pkg_name', + 'dummy.builder.aosp_webview_pkg_name': 'android_weblayer_with_aosp_webview_pkg_name', + } }, 'configs': { - 'android_release_bot_minimal_symbols_x86_webview_google': [ - 'android', 'release_bot', 'minimal_symbols', 'x86', - 'strip_debug_info', 'webview_google', + 'android_weblayer_with_aosp_webview_pkg_name': [ + 'android_release_bot_minimal_symbols_x86' + ], + + 'android_weblayer_with_google_webview_pkg_name': [ + 'android_release_bot_minimal_symbols_x86_webview_google' ], }, @@ -36,6 +40,18 @@ 'mixins': ['android_without_codecs', 'chrome_with_codecs'], }, + # Default webview package name is com.android.webview which + # is necessary for skew tests to work on Android M and Anroid 10 + # x86 builders. + 'android_release_bot_minimal_symbols_x86': { + 'mixins': ['android', 'release_bot', 'minimal_symbols', 'x86', + 'strip_debug_info', 'improved_debugging'], + }, + + 'android_release_bot_minimal_symbols_x86_webview_google': { + 'mixins': ['android_release_bot_minimal_symbols_x86', 'webview_google'], + }, + 'android_without_codecs': { 'gn_args': 'target_os="android"', }, @@ -67,7 +83,7 @@ }, 'release_bot': { - 'mixins': ['release', 'static'], + 'mixins': ['release', 'static', 'goma'], }, 'static': { @@ -85,5 +101,9 @@ 'x86': { 'gn_args': 'target_cpu="x86"', }, + + 'improved_debugging': { + 'gn_args': 'is_java_debug=true dcheck_always_on=true', + }, }, } diff --git a/chromium/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py b/chromium/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py index 87286c153dc..93c6826cbe0 100755 --- a/chromium/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py +++ b/chromium/weblayer/browser/android/javatests/weblayer_instrumentation_test_versions.py @@ -10,7 +10,7 @@ # Example usage, testing M80 tests and client against master implementation: # autoninja -C out/Release weblayer_instrumentation_test_versions_apk # cipd install --root /tmp/M80 chromium/testing/weblayer-x86 m80 -# out/Release/bin/run_weblayer_instrumentation_tests_versions_apk \ +# out/Release/bin/run_weblayer_instrumentation_test_versions_apk \ # --test-runner-outdir out/Release # --client-outdir /tmp/M80/out/Release # --implementation-outdir out/Release |