openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Allow test handlers to be either FixturePreparer or testCustomizer" am: 241f547365 am: 8381f3c74e am: d80d2f227a 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629633

Change-Id: Idd57f47b037c65dbcd4f106b5fcd4b7413c5fe1a
This commit is contained in:
Paul Duffin 2021-03-22 09:59:56 +00:00 committed by Automerger Merge Worker
parent 1c62e2eaa6 d80d2f227a
commit 992c564089
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apex/apex_test.go
View File

@ -50,14 +50,14 @@ func names(s string) (ns []string) {
return
}
func testApexError(t *testing.T, pattern, bp string, handlers ...testCustomizer) {
func testApexError(t *testing.T, pattern, bp string, handlers ...interface{}) {
t.Helper()
testApexFixtureFactory(bp, handlers).
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)).
RunTest(t)
}
func testApex(t *testing.T, bp string, handlers ...testCustomizer) *android.TestContext {
func testApex(t *testing.T, bp string, handlers ...interface{}) *android.TestContext {
t.Helper()
result := testApexFixtureFactory(bp, handlers).RunTest(t)
return result.TestContext
@ -208,14 +208,26 @@ var apexFixtureFactory = android.NewFixtureFactory(
}),
)
func testApexFixtureFactory(bp string, handlers []testCustomizer) android.FixtureFactory {
factory := apexFixtureFactory.Extend(
android.FixtureCustomPreparer(func(fixture android.Fixture) {
for _, handler := range handlers {
handler(fixture.MockFS(), fixture.Config())
func testApexFixtureFactory(bp string, handlers []interface{}) android.FixtureFactory {
var preparers []android.FixturePreparer
for _, handler := range handlers {
var preparer android.FixturePreparer
if p, ok := handler.(android.FixturePreparer); ok {
preparer = p
} else {
var customizer testCustomizer
if c, ok := handler.(testCustomizer); ok {
customizer = c
} else {
customizer = handler.(func(fs map[string][]byte, config android.Config))
}
}),
)
preparer = android.FixtureCustomPreparer(func(fixture android.Fixture) {
customizer(fixture.MockFS(), fixture.Config())
})
}
preparers = append(preparers, preparer)
}
factory := apexFixtureFactory.Extend(preparers...)
if bp != "" {
factory = factory.Extend(android.FixtureWithRootAndroidBp(bp))
}