diff options
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 161 |
1 files changed, 161 insertions, 0 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index a7ee8d12f..f86ab5720 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -43,6 +43,7 @@ func testSdkWithJava(t *testing.T, bp string) *testSdkResult { "api/system-server-current.txt": nil, "api/system-server-removed.txt": nil, "build/soong/scripts/gen-java-current-api-files.sh": nil, + "docs/known_doctags": nil, } // for java_sdk_library tests @@ -91,6 +92,7 @@ java_import { // Contains tests for SDK members provided by the java package. func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -120,23 +122,27 @@ func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) { java_import { name: "mysdk_sdkmember@current", sdk_member_name: "sdkmember", + visibility: ["//visibility:public"], jars: ["java/sdkmember.jar"], } java_import { name: "sdkmember", prefer: false, + visibility: ["//visibility:public"], jars: ["java/sdkmember.jar"], } sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_sdkmember@current"], } `)) } func TestBasicSdkWithJavaLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -216,6 +222,7 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) { } func TestSnapshotWithJavaHeaderLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -242,17 +249,20 @@ func TestSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_myjavalib@current"], } @@ -265,6 +275,7 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl } func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -294,6 +305,7 @@ func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -302,6 +314,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -309,6 +322,7 @@ java_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_header_libs: ["mysdk_myjavalib@current"], @@ -322,6 +336,7 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl } func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -346,6 +361,7 @@ func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) { java_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -360,6 +376,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -373,6 +390,7 @@ java_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], host_supported: true, java_header_libs: ["mysdk_myjavalib@current"], } @@ -385,6 +403,7 @@ sdk_snapshot { } func TestSnapshotWithJavaImplLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` module_exports { name: "myexports", @@ -412,17 +431,20 @@ func TestSnapshotWithJavaImplLibrary(t *testing.T) { java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavalib.jar"], } module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], java_libs: ["myexports_myjavalib@current"], } @@ -435,6 +457,7 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl } func TestHostSnapshotWithJavaImplLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` module_exports { name: "myexports", @@ -464,6 +487,7 @@ func TestHostSnapshotWithJavaImplLibrary(t *testing.T) { java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -472,6 +496,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavalib.jar"], @@ -479,6 +504,7 @@ java_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_libs: ["myexports_myjavalib@current"], @@ -492,6 +518,7 @@ aidl/foo/bar/Test.aidl -> aidl/aidl/foo/bar/Test.aidl } func TestSnapshotWithJavaTest(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` module_exports { name: "myexports", @@ -515,6 +542,7 @@ func TestSnapshotWithJavaTest(t *testing.T) { java_test_import { name: "myexports_myjavatests@current", sdk_member_name: "myjavatests", + visibility: ["//visibility:public"], jars: ["java/myjavatests.jar"], test_config: "java/myjavatests-AndroidTest.xml", } @@ -522,12 +550,14 @@ java_test_import { java_test_import { name: "myjavatests", prefer: false, + visibility: ["//visibility:public"], jars: ["java/myjavatests.jar"], test_config: "java/myjavatests-AndroidTest.xml", } module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], java_tests: ["myexports_myjavatests@current"], } `), @@ -539,6 +569,7 @@ module_exports_snapshot { } func TestHostSnapshotWithJavaTest(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` module_exports { name: "myexports", @@ -565,6 +596,7 @@ func TestHostSnapshotWithJavaTest(t *testing.T) { java_test_import { name: "myexports_myjavatests@current", sdk_member_name: "myjavatests", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavatests.jar"], @@ -574,6 +606,7 @@ java_test_import { java_test_import { name: "myjavatests", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/myjavatests.jar"], @@ -582,6 +615,7 @@ java_test_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_tests: ["myexports_myjavatests@current"], @@ -608,6 +642,7 @@ func testSdkWithDroidstubs(t *testing.T, bp string) *testSdkResult { // directly or indirectly from an APEX as droidstubs can never be a part of an // apex. func TestBasicSdkWithDroidstubs(t *testing.T) { + t.Parallel() testSdkWithDroidstubs(t, ` sdk { name: "mysdk", @@ -638,6 +673,7 @@ func TestBasicSdkWithDroidstubs(t *testing.T) { } func TestSnapshotWithDroidstubs(t *testing.T) { + t.Parallel() result := testSdkWithDroidstubs(t, ` module_exports { name: "myexports", @@ -659,17 +695,20 @@ func TestSnapshotWithDroidstubs(t *testing.T) { prebuilt_stubs_sources { name: "myexports_myjavaapistubs@current", sdk_member_name: "myjavaapistubs", + visibility: ["//visibility:public"], srcs: ["java/myjavaapistubs_stubs_sources"], } prebuilt_stubs_sources { name: "myjavaapistubs", prefer: false, + visibility: ["//visibility:public"], srcs: ["java/myjavaapistubs_stubs_sources"], } module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], stubs_sources: ["myexports_myjavaapistubs@current"], } @@ -680,6 +719,7 @@ module_exports_snapshot { } func TestHostSnapshotWithDroidstubs(t *testing.T) { + t.Parallel() result := testSdkWithDroidstubs(t, ` module_exports { name: "myexports", @@ -705,6 +745,7 @@ func TestHostSnapshotWithDroidstubs(t *testing.T) { prebuilt_stubs_sources { name: "myexports_myjavaapistubs@current", sdk_member_name: "myjavaapistubs", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, srcs: ["java/myjavaapistubs_stubs_sources"], @@ -713,6 +754,7 @@ prebuilt_stubs_sources { prebuilt_stubs_sources { name: "myjavaapistubs", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, srcs: ["java/myjavaapistubs_stubs_sources"], @@ -720,6 +762,7 @@ prebuilt_stubs_sources { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, stubs_sources: ["myexports_myjavaapistubs@current"], @@ -731,6 +774,7 @@ module_exports_snapshot { } func TestSnapshotWithJavaSystemModules(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -765,12 +809,14 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) { java_import { name: "mysdk_exported-system-module@current", sdk_member_name: "exported-system-module", + visibility: ["//visibility:public"], jars: ["java/exported-system-module.jar"], } java_import { name: "exported-system-module", prefer: false, + visibility: ["//visibility:public"], jars: ["java/exported-system-module.jar"], } @@ -791,6 +837,7 @@ java_import { java_system_modules_import { name: "mysdk_my-system-modules@current", sdk_member_name: "my-system-modules", + visibility: ["//visibility:public"], libs: [ "mysdk_system-module@current", "mysdk_exported-system-module@current", @@ -800,6 +847,7 @@ java_system_modules_import { java_system_modules_import { name: "my-system-modules", prefer: false, + visibility: ["//visibility:public"], libs: [ "mysdk_system-module", "exported-system-module", @@ -808,6 +856,7 @@ java_system_modules_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_header_libs: ["mysdk_exported-system-module@current"], java_system_modules: ["mysdk_my-system-modules@current"], } @@ -820,6 +869,7 @@ sdk_snapshot { } func TestHostSnapshotWithJavaSystemModules(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -870,6 +920,7 @@ java_import { java_system_modules_import { name: "mysdk_my-system-modules@current", sdk_member_name: "my-system-modules", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, libs: ["mysdk_system-module@current"], @@ -878,6 +929,7 @@ java_system_modules_import { java_system_modules_import { name: "my-system-modules", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, libs: ["mysdk_system-module"], @@ -885,6 +937,7 @@ java_system_modules_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, java_system_modules: ["mysdk_my-system-modules@current"], @@ -895,6 +948,7 @@ sdk_snapshot { } func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` module_exports { name: "myexports", @@ -938,6 +992,7 @@ func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) { java_import { name: "myexports_hostjavalib@current", sdk_member_name: "hostjavalib", + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/hostjavalib.jar"], @@ -946,6 +1001,7 @@ java_import { java_import { name: "hostjavalib", prefer: false, + visibility: ["//visibility:public"], device_supported: false, host_supported: true, jars: ["java/hostjavalib.jar"], @@ -954,18 +1010,21 @@ java_import { java_import { name: "myexports_androidjavalib@current", sdk_member_name: "androidjavalib", + visibility: ["//visibility:public"], jars: ["java/androidjavalib.jar"], } java_import { name: "androidjavalib", prefer: false, + visibility: ["//visibility:public"], jars: ["java/androidjavalib.jar"], } java_import { name: "myexports_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -980,6 +1039,7 @@ java_import { java_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], host_supported: true, target: { android: { @@ -993,6 +1053,7 @@ java_import { module_exports_snapshot { name: "myexports@current", + visibility: ["//visibility:public"], host_supported: true, java_libs: ["myexports_myjavalib@current"], target: { @@ -1015,6 +1076,7 @@ module_exports_snapshot { } func TestSnapshotWithJavaSdkLibrary(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1039,6 +1101,7 @@ func TestSnapshotWithJavaSdkLibrary(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: false, public: { @@ -1067,6 +1130,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: false, public: { @@ -1094,6 +1158,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1116,6 +1181,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1137,6 +1203,7 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], @@ -1150,6 +1217,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], @@ -1162,6 +1230,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1177,6 +1246,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1201,6 +1271,7 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], @@ -1214,6 +1285,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], shared_library: true, public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], @@ -1226,6 +1298,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1241,6 +1314,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1268,6 +1342,7 @@ func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1289,6 +1364,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1309,6 +1385,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1328,6 +1405,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1358,6 +1436,7 @@ func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1386,6 +1465,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1413,6 +1493,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1436,6 +1517,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1463,6 +1545,7 @@ func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1484,6 +1567,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], shared_library: true, public: { @@ -1504,6 +1588,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1523,6 +1608,7 @@ sdk_snapshot { } func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { + t.Parallel() result := testSdkWithJava(t, ` sdk { name: "mysdk", @@ -1548,6 +1634,7 @@ func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) { java_sdk_library_import { name: "mysdk_myjavalib@current", sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], naming_scheme: "default", shared_library: true, @@ -1563,6 +1650,7 @@ java_sdk_library_import { java_sdk_library_import { name: "myjavalib", prefer: false, + visibility: ["//visibility:public"], apex_available: ["//apex_available:anyapex"], naming_scheme: "default", shared_library: true, @@ -1577,6 +1665,7 @@ java_sdk_library_import { sdk_snapshot { name: "mysdk@current", + visibility: ["//visibility:public"], java_sdk_libs: ["mysdk_myjavalib@current"], } `), @@ -1590,3 +1679,75 @@ sdk_snapshot { ), ) } + +func TestSnapshotWithJavaSdkLibrary_DoctagFiles(t *testing.T) { + result := testSdkWithJava(t, ` + sdk { + name: "mysdk", + java_sdk_libs: ["myjavalib"], + } + + java_sdk_library { + name: "myjavalib", + srcs: ["Test.java"], + sdk_version: "current", + public: { + enabled: true, + }, + doctag_files: ["docs/known_doctags"], + } + + filegroup { + name: "mygroup", + srcs: [":myjavalib{.doctags}"], + } + `) + + result.CheckSnapshot("mysdk", "", + checkAndroidBpContents(` +// This is auto-generated. DO NOT EDIT. + +java_sdk_library_import { + name: "mysdk_myjavalib@current", + sdk_member_name: "myjavalib", + visibility: ["//visibility:public"], + shared_library: true, + doctag_files: ["doctags/docs/known_doctags"], + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "current", + }, +} + +java_sdk_library_import { + name: "myjavalib", + prefer: false, + visibility: ["//visibility:public"], + shared_library: true, + doctag_files: ["doctags/docs/known_doctags"], + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "current", + }, +} + +sdk_snapshot { + name: "mysdk@current", + visibility: ["//visibility:public"], + java_sdk_libs: ["mysdk_myjavalib@current"], +} +`), + checkAllCopyRules(` +.intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt +docs/known_doctags -> doctags/docs/known_doctags +`), + ) +} |