StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make CheckHiddenAPIRuleInputs more reusable"

Browse Source
This commit is contained in:
Paul Duffin
2021-06-21 16:16:12 +00:00
committed by Gerrit Code Review
parent 9d31361873 51d7da2c4e
commit 07cdd37ae5
3 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/platform_bootclasspath_test.go
View File

@@ -319,10 +319,9 @@ func TestPlatformBootclasspath_HiddenAPIMonolithicFiles(t *testing.T) {
// creates the index.csv file.
platformBootclasspath := result.ModuleForTests("myplatform-bootclasspath", "android_common")
indexRule := platformBootclasspath.Rule("monolithic_hidden_API_index")
CheckHiddenAPIRuleInputs(t, `
.intermediates/bar/android_common/javac/bar.jar
.intermediates/foo-hiddenapi-annotations/android_common/javac/foo-hiddenapi-annotations.jar
.intermediates/foo/android_common/javac/foo.jar
`,
indexRule)
CheckHiddenAPIRuleInputs(t, "index", `
out/soong/.intermediates/bar/android_common/javac/bar.jar
out/soong/.intermediates/foo-hiddenapi-annotations/android_common/javac/foo-hiddenapi-annotations.jar
out/soong/.intermediates/foo/android_common/javac/foo.jar
`, indexRule)
}

17
java/testing.go
View File

@@ -17,6 +17,7 @@ package java
import (
"fmt"
"reflect"
"regexp"
"sort"
"strings"
"testing"
@@ -393,12 +394,20 @@ func CheckPlatformBootclasspathFragments(t *testing.T, result *android.TestResul
android.AssertDeepEquals(t, fmt.Sprintf("%s fragments", "platform-bootclasspath"), expected, pairs)
}
func CheckHiddenAPIRuleInputs(t *testing.T, expected string, hiddenAPIRule android.TestingBuildParams) {
func CheckHiddenAPIRuleInputs(t *testing.T, message string, expected string, hiddenAPIRule android.TestingBuildParams) {
t.Helper()
actual := strings.TrimSpace(strings.Join(android.NormalizePathsForTesting(hiddenAPIRule.Implicits), "\n"))
expected = strings.TrimSpace(expected)
inputs := android.Paths{}
if hiddenAPIRule.Input != nil {
inputs = append(inputs, hiddenAPIRule.Input)
}
inputs = append(inputs, hiddenAPIRule.Inputs...)
inputs = append(inputs, hiddenAPIRule.Implicits...)
inputs = android.SortedUniquePaths(inputs)
actual := strings.TrimSpace(strings.Join(inputs.RelativeToTop().Strings(), "\n"))
re := regexp.MustCompile(`\n\s+`)
expected = strings.TrimSpace(re.ReplaceAllString(expected, "\n"))
if actual != expected {
t.Errorf("Expected hiddenapi rule inputs:\n%s\nactual inputs:\n%s", expected, actual)
t.Errorf("Expected hiddenapi rule inputs - %s:\n%s\nactual inputs:\n%s", message, expected, actual)
}
}