summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/Android.bp3
-rw-r--r--java/app.go3
-rw-r--r--java/bootclasspath_fragment.go2
-rw-r--r--java/code_metadata_test.go115
-rw-r--r--java/java.go3
-rw-r--r--java/robolectric.go2
-rw-r--r--java/test_spec_test.go122
7 files changed, 0 insertions, 250 deletions
diff --git a/java/Android.bp b/java/Android.bp
index 1101d7a33..03fde3b80 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -15,7 +15,6 @@ bootstrap_go_package {
"soong-dexpreopt",
"soong-genrule",
"soong-java-config",
- "soong-testing",
"soong-provenance",
"soong-python",
"soong-remoteexec",
@@ -86,7 +85,6 @@ bootstrap_go_package {
"app_import_test.go",
"app_set_test.go",
"app_test.go",
- "code_metadata_test.go",
"container_test.go",
"bootclasspath_fragment_test.go",
"device_host_converter_test.go",
@@ -117,7 +115,6 @@ bootstrap_go_package {
"sdk_version_test.go",
"system_modules_test.go",
"systemserver_classpath_fragment_test.go",
- "test_spec_test.go",
],
pluginFor: ["soong_build"],
visibility: ["//visibility:public"],
diff --git a/java/app.go b/java/app.go
index addbc28b0..2d75ccdf9 100644
--- a/java/app.go
+++ b/java/app.go
@@ -22,8 +22,6 @@ import (
"path/filepath"
"strings"
- "android/soong/testing"
-
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
@@ -1443,7 +1441,6 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...)
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...)
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_prefer32_data)...)
- android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
InstalledFiles: a.data,
OutputFile: a.OutputFile(),
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index 4fcd40bd3..1a3368057 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -23,7 +23,6 @@ import (
"android/soong/android"
"android/soong/dexpreopt"
- "android/soong/testing"
"github.com/google/blueprint/proptools"
@@ -524,7 +523,6 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo
if ctx.Module() != ctx.FinalModule() {
b.HideFromMake()
}
- android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
// getProfileProviderApex returns the name of the apex that provides a boot image profile, or an
diff --git a/java/code_metadata_test.go b/java/code_metadata_test.go
deleted file mode 100644
index 9dc9a2262..000000000
--- a/java/code_metadata_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package java
-
-import (
- "strings"
- "testing"
-
- "android/soong/android"
- soongTesting "android/soong/testing"
- "android/soong/testing/code_metadata_internal_proto"
-
- "google.golang.org/protobuf/proto"
-)
-
-func TestCodeMetadata(t *testing.T) {
- bp := `code_metadata {
- name: "module-name",
- teamId: "12345",
- code: [
- "foo",
- ]
- }
-
- java_sdk_library {
- name: "foo",
- srcs: ["a.java"],
- }`
- result := runCodeMetadataTest(t, android.FixtureExpectsNoErrors, bp)
-
- module := result.ModuleForTests("module-name", "")
-
- // Check that the provider has the right contents
- data, _ := android.OtherModuleProvider(result, module.Module(), soongTesting.CodeMetadataProviderKey)
- if !strings.HasSuffix(
- data.IntermediatePath.String(), "/intermediateCodeMetadata.pb",
- ) {
- t.Errorf(
- "Missing intermediates path in provider: %s",
- data.IntermediatePath.String(),
- )
- }
-
- metadata := android.ContentFromFileRuleForTests(t, result.TestContext,
- module.Output(data.IntermediatePath.String()))
-
- metadataList := make([]*code_metadata_internal_proto.CodeMetadataInternal_TargetOwnership, 0, 2)
- teamId := "12345"
- bpFilePath := "Android.bp"
- targetName := "foo"
- srcFile := []string{"a.java"}
- expectedMetadataProto := code_metadata_internal_proto.CodeMetadataInternal_TargetOwnership{
- TrendyTeamId: &teamId,
- TargetName: &targetName,
- Path: &bpFilePath,
- SourceFiles: srcFile,
- }
- metadataList = append(metadataList, &expectedMetadataProto)
-
- CodeMetadataMetadata := code_metadata_internal_proto.CodeMetadataInternal{TargetOwnershipList: metadataList}
- protoData, _ := proto.Marshal(&CodeMetadataMetadata)
- expectedMetadata := string(protoData)
-
- if metadata != expectedMetadata {
- t.Errorf(
- "Retrieved metadata: %s is not equal to expectedMetadata: %s", metadata,
- expectedMetadata,
- )
- }
-
- // Tests for all_test_spec singleton.
- singleton := result.SingletonForTests("all_code_metadata")
- rule := singleton.Rule("all_code_metadata_rule")
- prebuiltOs := result.Config.PrebuiltOS()
- expectedCmd := "out/soong/host/" + prebuiltOs + "/bin/metadata -rule code_metadata -inputFile out/soong/all_code_metadata_paths.rsp -outputFile out/soong/ownership/all_code_metadata.pb"
- expectedOutputFile := "out/soong/ownership/all_code_metadata.pb"
- expectedInputFile := "out/soong/.intermediates/module-name/intermediateCodeMetadata.pb"
- if !strings.Contains(
- strings.TrimSpace(rule.Output.String()),
- expectedOutputFile,
- ) {
- t.Errorf(
- "Retrieved singletonOutputFile: %s is not equal to expectedSingletonOutputFile: %s",
- rule.Output.String(), expectedOutputFile,
- )
- }
-
- if !strings.Contains(
- strings.TrimSpace(rule.Inputs[0].String()),
- expectedInputFile,
- ) {
- t.Errorf(
- "Retrieved singletonInputFile: %s is not equal to expectedSingletonInputFile: %s",
- rule.Inputs[0].String(), expectedInputFile,
- )
- }
-
- if !strings.Contains(
- strings.TrimSpace(rule.RuleParams.Command),
- expectedCmd,
- ) {
- t.Errorf(
- "Retrieved cmd: %s doesn't contain expectedCmd: %s",
- rule.RuleParams.Command, expectedCmd,
- )
- }
-}
-func runCodeMetadataTest(
- t *testing.T, errorHandler android.FixtureErrorHandler, bp string,
-) *android.TestResult {
- return android.GroupFixturePreparers(
- soongTesting.PrepareForTestWithTestingBuildComponents, prepareForJavaTest,
- PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("foo"),
- ).
- ExtendWithErrorHandler(errorHandler).
- RunTestWithBp(t, bp)
-}
diff --git a/java/java.go b/java/java.go
index 679714858..51e294ef3 100644
--- a/java/java.go
+++ b/java/java.go
@@ -26,7 +26,6 @@ import (
"strings"
"android/soong/remoteexec"
- "android/soong/testing"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
@@ -1557,7 +1556,6 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
j.Test.generateAndroidBuildActionsWithConfig(ctx, configs)
- android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
InstalledFiles: j.data,
OutputFile: j.outputFile,
@@ -1573,7 +1571,6 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
checkMinSdkVersionMts(ctx, j.MinSdkVersion(ctx))
j.generateAndroidBuildActionsWithConfig(ctx, nil)
- android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, configs []tradefed.Config) {
diff --git a/java/robolectric.go b/java/robolectric.go
index e6f80ac37..5f46267f9 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -19,7 +19,6 @@ import (
"android/soong/android"
"android/soong/java/config"
- "android/soong/testing"
"android/soong/tradefed"
"github.com/google/blueprint/proptools"
@@ -243,7 +242,6 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
}
r.installFile = ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.outputFile, installDeps...)
- android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
}
func generateSameDirRoboTestConfigJar(ctx android.ModuleContext, outputFile android.ModuleOutPath) {
diff --git a/java/test_spec_test.go b/java/test_spec_test.go
deleted file mode 100644
index f0a5fdb4b..000000000
--- a/java/test_spec_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package java
-
-import (
- "strings"
- "testing"
-
- "android/soong/android"
- soongTesting "android/soong/testing"
- "android/soong/testing/test_spec_proto"
- "google.golang.org/protobuf/proto"
-)
-
-func TestTestSpec(t *testing.T) {
- bp := `test_spec {
- name: "module-name",
- teamId: "12345",
- tests: [
- "java-test-module-name-one",
- "java-test-module-name-two"
- ]
- }
-
- java_test {
- name: "java-test-module-name-one",
- }
-
- java_test {
- name: "java-test-module-name-two",
- }`
- result := runTestSpecTest(t, android.FixtureExpectsNoErrors, bp)
-
- module := result.ModuleForTests("module-name", "")
-
- // Check that the provider has the right contents
- data, _ := android.OtherModuleProvider(result, module.Module(), soongTesting.TestSpecProviderKey)
- if !strings.HasSuffix(
- data.IntermediatePath.String(), "/intermediateTestSpecMetadata.pb",
- ) {
- t.Errorf(
- "Missing intermediates path in provider: %s",
- data.IntermediatePath.String(),
- )
- }
-
- metadata := android.ContentFromFileRuleForTests(t, result.TestContext,
- module.Output(data.IntermediatePath.String()))
-
- metadataList := make([]*test_spec_proto.TestSpec_OwnershipMetadata, 0, 2)
- teamId := "12345"
- bpFilePath := "Android.bp"
- targetNames := []string{
- "java-test-module-name-one", "java-test-module-name-two",
- }
-
- for _, test := range targetNames {
- targetName := test
- metadata := test_spec_proto.TestSpec_OwnershipMetadata{
- TrendyTeamId: &teamId,
- TargetName: &targetName,
- Path: &bpFilePath,
- }
- metadataList = append(metadataList, &metadata)
- }
- testSpecMetadata := test_spec_proto.TestSpec{OwnershipMetadataList: metadataList}
- protoData, _ := proto.Marshal(&testSpecMetadata)
- expectedMetadata := string(protoData)
-
- if metadata != expectedMetadata {
- t.Errorf(
- "Retrieved metadata: %s doesn't contain expectedMetadata: %s", metadata,
- expectedMetadata,
- )
- }
-
- // Tests for all_test_spec singleton.
- singleton := result.SingletonForTests("all_test_specs")
- rule := singleton.Rule("all_test_specs_rule")
- prebuiltOs := result.Config.PrebuiltOS()
- expectedCmd := "out/soong/host/" + prebuiltOs + "/bin/metadata -rule test_spec -inputFile out/soong/all_test_spec_paths.rsp -outputFile out/soong/ownership/all_test_specs.pb"
- expectedOutputFile := "out/soong/ownership/all_test_specs.pb"
- expectedInputFile := "out/soong/.intermediates/module-name/intermediateTestSpecMetadata.pb"
- if !strings.Contains(
- strings.TrimSpace(rule.Output.String()),
- expectedOutputFile,
- ) {
- t.Errorf(
- "Retrieved singletonOutputFile: %s is not equal to expectedSingletonOutputFile: %s",
- rule.Output.String(), expectedOutputFile,
- )
- }
-
- if !strings.Contains(
- strings.TrimSpace(rule.Inputs[0].String()),
- expectedInputFile,
- ) {
- t.Errorf(
- "Retrieved singletonInputFile: %s is not equal to expectedSingletonInputFile: %s",
- rule.Inputs[0].String(), expectedInputFile,
- )
- }
-
- if !strings.Contains(
- strings.TrimSpace(rule.RuleParams.Command),
- expectedCmd,
- ) {
- t.Errorf(
- "Retrieved cmd: %s is not equal to expectedCmd: %s",
- rule.RuleParams.Command, expectedCmd,
- )
- }
-}
-
-func runTestSpecTest(
- t *testing.T, errorHandler android.FixtureErrorHandler, bp string,
-) *android.TestResult {
- return android.GroupFixturePreparers(
- soongTesting.PrepareForTestWithTestingBuildComponents,
- PrepareForIntegrationTestWithJava,
- ).
- ExtendWithErrorHandler(errorHandler).
- RunTestWithBp(t, bp)
-}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-21 00:28:38 +0000