From 5312de584408f56ede119bfbc094b39a090969be Mon Sep 17 00:00:00 2001 From: Joshua Trask Date: Tue, 21 Dec 2021 16:40:22 -0500 Subject: Initial (inherited) tests for unbundled chooser. This required disabling the #testEditImageLogs method in the base class (ag/16520095) due to what could be a legitimate failure in the unbundled implementation; we should investigate imminently. Note this only brings the tests up to parity with the system implementation - existing issues in the system ChooserActivityTest (e.g. b/211669337) will presumably still occur in the unbundled version. No test flakes are known to be specific to unbundling (among those that are enabled after ag/16520095). Bug: 202165481,211669337 Test: `atest UnbundledChooserActivityTest` Change-Id: If8e2b896627661e59fa4a85aa3dd1eedb8eb91bc --- java/tests/Android.bp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'java/tests/Android.bp') diff --git a/java/tests/Android.bp b/java/tests/Android.bp index fc78a604..fdabc4e0 100644 --- a/java/tests/Android.bp +++ b/java/tests/Android.bp @@ -13,10 +13,13 @@ android_test { "android.test.runner", "android.test.base", "android.test.mock", + "framework", + "framework-res", ], static_libs: [ "IntentResolver-core", + "ChooserActivityTestsLib", "androidx.test.rules", "mockito-target-minus-junit4", "androidx.test.espresso.core", @@ -24,10 +27,10 @@ android_test { "testables", "testng", ], - jni_libs: [ - ], test_suites: ["general-tests"], - min_sdk_version: "30", + sdk_version: "core_platform", platform_apis: true, compile_multilib: "both", + + dont_merge_manifests: true, } -- cgit v1.2.3-59-g8ed1b