Support pruning properties by build release
Adds a general mechanism for pruning selected sdk member properties
(i.e. setting their fields to their zero value) and uses that to prune
any properties that do not support a specified target build release.
Follow up changes will use that to allow building an sdk snapshot that
is compatible with previous release S.
Bug: 197842263
Test: m nothing
Merged-In: Ib949a9cfe85fff30f86228eeb15d3a45c073b037
Change-Id: Ib949a9cfe85fff30f86228eeb15d3a45c073b037
(cherry picked from commit 0c3acbfd72
)
This commit is contained in:
@@ -98,3 +98,88 @@ func TestBuildReleaseSetContains(t *testing.T) {
|
||||
android.AssertBoolEquals(t, "set does not contain T", false, set.contains(buildReleaseT))
|
||||
})
|
||||
}
|
||||
|
||||
func TestPropertyPrunerInvalidTag(t *testing.T) {
|
||||
type brokenStruct struct {
|
||||
Broken string `supported_build_releases:"A"`
|
||||
}
|
||||
type containingStruct struct {
|
||||
Nested brokenStruct
|
||||
}
|
||||
|
||||
t.Run("broken struct", func(t *testing.T) {
|
||||
android.AssertPanicMessageContains(t, "error", "invalid `supported_build_releases` tag on Broken of *sdk.brokenStruct: unknown release \"A\"", func() {
|
||||
newPropertyPrunerByBuildRelease(&brokenStruct{}, buildReleaseS)
|
||||
})
|
||||
})
|
||||
|
||||
t.Run("nested broken struct", func(t *testing.T) {
|
||||
android.AssertPanicMessageContains(t, "error", "invalid `supported_build_releases` tag on Nested.Broken of *sdk.containingStruct: unknown release \"A\"", func() {
|
||||
newPropertyPrunerByBuildRelease(&containingStruct{}, buildReleaseS)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
func TestPropertyPrunerByBuildRelease(t *testing.T) {
|
||||
type nested struct {
|
||||
F1_only string `supported_build_releases:"F1"`
|
||||
}
|
||||
|
||||
type testBuildReleasePruner struct {
|
||||
Default string
|
||||
S_and_T_only string `supported_build_releases:"S-T"`
|
||||
T_later string `supported_build_releases:"T+"`
|
||||
Nested nested
|
||||
}
|
||||
|
||||
input := testBuildReleasePruner{
|
||||
Default: "Default",
|
||||
S_and_T_only: "S_and_T_only",
|
||||
T_later: "T_later",
|
||||
Nested: nested{
|
||||
F1_only: "F1_only",
|
||||
},
|
||||
}
|
||||
|
||||
t.Run("target S", func(t *testing.T) {
|
||||
testStruct := input
|
||||
pruner := newPropertyPrunerByBuildRelease(&testStruct, buildReleaseS)
|
||||
pruner.pruneProperties(&testStruct)
|
||||
|
||||
expected := input
|
||||
expected.T_later = ""
|
||||
expected.Nested.F1_only = ""
|
||||
android.AssertDeepEquals(t, "test struct", expected, testStruct)
|
||||
})
|
||||
|
||||
t.Run("target T", func(t *testing.T) {
|
||||
testStruct := input
|
||||
pruner := newPropertyPrunerByBuildRelease(&testStruct, buildReleaseT)
|
||||
pruner.pruneProperties(&testStruct)
|
||||
|
||||
expected := input
|
||||
expected.Nested.F1_only = ""
|
||||
android.AssertDeepEquals(t, "test struct", expected, testStruct)
|
||||
})
|
||||
|
||||
t.Run("target F1", func(t *testing.T) {
|
||||
testStruct := input
|
||||
pruner := newPropertyPrunerByBuildRelease(&testStruct, buildReleaseFuture1)
|
||||
pruner.pruneProperties(&testStruct)
|
||||
|
||||
expected := input
|
||||
expected.S_and_T_only = ""
|
||||
android.AssertDeepEquals(t, "test struct", expected, testStruct)
|
||||
})
|
||||
|
||||
t.Run("target F2", func(t *testing.T) {
|
||||
testStruct := input
|
||||
pruner := newPropertyPrunerByBuildRelease(&testStruct, buildReleaseFuture2)
|
||||
pruner.pruneProperties(&testStruct)
|
||||
|
||||
expected := input
|
||||
expected.S_and_T_only = ""
|
||||
expected.Nested.F1_only = ""
|
||||
android.AssertDeepEquals(t, "test struct", expected, testStruct)
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user