diff options
| author | 2024-01-02 19:44:52 +0000 | |
|---|---|---|
| committer | 2024-01-02 19:44:52 +0000 | |
| commit | a3759f98a63eb2ab4e0c6620d2e27d3434ee6ec0 (patch) | |
| tree | 005d4dc8d8c8b0b178467f18a959b31cb7f2a8dd /java/test_spec_test.go | |
| parent | 64c9e0ce6e4aa183b2fae40a18e3e5435c49229d (diff) | |
| parent | 31a674571e53f12dffb97698e65b9eee6ae0ebbc (diff) | |
Merge "Write raw files to disk instead of the ninja file" into main
Diffstat (limited to 'java/test_spec_test.go')
| -rw-r--r-- | java/test_spec_test.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/java/test_spec_test.go b/java/test_spec_test.go index f628b4b74..4144dad69 100644 --- a/java/test_spec_test.go +++ b/java/test_spec_test.go @@ -29,12 +29,10 @@ func TestTestSpec(t *testing.T) { }` result := runTestSpecTest(t, android.FixtureExpectsNoErrors, bp) - module := result.ModuleForTests( - "module-name", "", - ).Module().(*soongTesting.TestSpecModule) + module := result.ModuleForTests("module-name", "") // Check that the provider has the right contents - data, _ := android.SingletonModuleProvider(result, module, soongTesting.TestSpecProviderKey) + data, _ := android.SingletonModuleProvider(result, module.Module(), soongTesting.TestSpecProviderKey) if !strings.HasSuffix( data.IntermediatePath.String(), "/intermediateTestSpecMetadata.pb", ) { @@ -44,13 +42,8 @@ func TestTestSpec(t *testing.T) { ) } - buildParamsSlice := module.BuildParamsForTests() - var metadata = "" - for _, params := range buildParamsSlice { - if params.Rule.String() == "android/soong/android.writeFile" { - metadata = params.Args["content"] - } - } + metadata := android.ContentFromFileRuleForTests(t, result.TestContext, + module.Output(data.IntermediatePath.String())) metadataList := make([]*test_spec_proto.TestSpec_OwnershipMetadata, 0, 2) teamId := "12345" @@ -70,9 +63,7 @@ func TestTestSpec(t *testing.T) { } testSpecMetadata := test_spec_proto.TestSpec{OwnershipMetadataList: metadataList} protoData, _ := proto.Marshal(&testSpecMetadata) - rawData := string(protoData) - formattedData := strings.ReplaceAll(rawData, "\n", "\\n") - expectedMetadata := "'" + formattedData + "\\n'" + expectedMetadata := string(protoData) if metadata != expectedMetadata { t.Errorf( |