diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 153 |
1 files changed, 61 insertions, 92 deletions
diff --git a/java/java_test.go b/java/java_test.go index a2466f995..7b8984810 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -61,33 +61,16 @@ func TestMain(m *testing.M) { func testConfig(env map[string]string, bp string, fs map[string][]byte) android.Config { bp += dexpreopt.BpToolModulesForTest() - config := TestConfig(buildDir, env, bp, fs) - - // Set up the global Once cache used for dexpreopt.GlobalSoongConfig, so that - // it doesn't create a real one, which would fail. - _ = dexpreopt.GlobalSoongConfigForTests(config) - - return config + return TestConfig(buildDir, env, bp, fs) } func testContext(config android.Config) *android.TestContext { ctx := android.NewTestArchContext(config) - RegisterJavaBuildComponents(ctx) - RegisterAppBuildComponents(ctx) - RegisterAppImportBuildComponents(ctx) - RegisterAppSetBuildComponents(ctx) - RegisterAARBuildComponents(ctx) - RegisterGenRuleBuildComponents(ctx) - RegisterRuntimeResourceOverlayBuildComponents(ctx) - RegisterSystemModulesBuildComponents(ctx) + RegisterRequiredBuildComponentsForTest(ctx) ctx.RegisterModuleType("java_plugin", PluginFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("python_binary_host", python.PythonBinaryHostFactory) - RegisterDocsBuildComponents(ctx) - RegisterStubsBuildComponents(ctx) - RegisterPrebuiltApisBuildComponents(ctx) - RegisterSdkLibraryBuildComponents(ctx) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterComponentsMutator) @@ -867,83 +850,43 @@ func TestJavaSdkLibraryEnforce(t *testing.T) { return config } - isValidDependency := func(configInfo testConfigInfo) bool { - if configInfo.enforceVendorInterface == false { - return true - } - - if configInfo.enforceJavaSdkLibraryCheck == false { - return true - } - - if inList("bar", configInfo.allowList) { - return true - } - - if configInfo.libraryType == "java_library" { - if configInfo.fromPartition != configInfo.toPartition { - if !configInfo.enforceProductInterface && - ((configInfo.fromPartition == "system" && configInfo.toPartition == "product") || - (configInfo.fromPartition == "product" && configInfo.toPartition == "system")) { - return true - } - return false - } - } - - return true - } - errorMessage := "is not allowed across the partitions" - allPartitionCombinations := func() [][2]string { - var result [][2]string - partitions := []string{"system", "vendor", "product"} - - for _, fromPartition := range partitions { - for _, toPartition := range partitions { - result = append(result, [2]string{fromPartition, toPartition}) - } - } - - return result - } - - allFlagCombinations := func() [][3]bool { - var result [][3]bool - flagValues := [2]bool{false, true} - - for _, vendorInterface := range flagValues { - for _, productInterface := range flagValues { - for _, enableEnforce := range flagValues { - result = append(result, [3]bool{vendorInterface, productInterface, enableEnforce}) - } - } - } + testJavaWithConfig(t, createTestConfig(testConfigInfo{ + libraryType: "java_library", + fromPartition: "product", + toPartition: "system", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: false, + })) - return result - } + testJavaWithConfig(t, createTestConfig(testConfigInfo{ + libraryType: "java_library", + fromPartition: "product", + toPartition: "system", + enforceVendorInterface: true, + enforceProductInterface: false, + enforceJavaSdkLibraryCheck: true, + })) - for _, libraryType := range []string{"java_library", "java_sdk_library"} { - for _, partitionValues := range allPartitionCombinations() { - for _, flagValues := range allFlagCombinations() { - testInfo := testConfigInfo{ - libraryType: libraryType, - fromPartition: partitionValues[0], - toPartition: partitionValues[1], - enforceVendorInterface: flagValues[0], - enforceProductInterface: flagValues[1], - enforceJavaSdkLibraryCheck: flagValues[2], - } + testJavaErrorWithConfig(t, errorMessage, createTestConfig(testConfigInfo{ + libraryType: "java_library", + fromPartition: "product", + toPartition: "system", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: true, + })) - if isValidDependency(testInfo) { - testJavaWithConfig(t, createTestConfig(testInfo)) - } else { - testJavaErrorWithConfig(t, errorMessage, createTestConfig(testInfo)) - } - } - } - } + testJavaErrorWithConfig(t, errorMessage, createTestConfig(testConfigInfo{ + libraryType: "java_library", + fromPartition: "vendor", + toPartition: "system", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: true, + })) testJavaWithConfig(t, createTestConfig(testConfigInfo{ libraryType: "java_library", @@ -958,11 +901,37 @@ func TestJavaSdkLibraryEnforce(t *testing.T) { testJavaErrorWithConfig(t, errorMessage, createTestConfig(testConfigInfo{ libraryType: "java_library", fromPartition: "vendor", + toPartition: "product", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: true, + })) + + testJavaWithConfig(t, createTestConfig(testConfigInfo{ + libraryType: "java_sdk_library", + fromPartition: "product", toPartition: "system", enforceVendorInterface: true, enforceProductInterface: true, enforceJavaSdkLibraryCheck: true, - allowList: []string{"foo"}, + })) + + testJavaWithConfig(t, createTestConfig(testConfigInfo{ + libraryType: "java_sdk_library", + fromPartition: "vendor", + toPartition: "system", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: true, + })) + + testJavaWithConfig(t, createTestConfig(testConfigInfo{ + libraryType: "java_sdk_library", + fromPartition: "vendor", + toPartition: "product", + enforceVendorInterface: true, + enforceProductInterface: true, + enforceJavaSdkLibraryCheck: true, })) } |