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

Merge "Cleanup the now unused testCustomizer" am: 50e49818a3 am: a1cf464f06

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

Change-Id: I5ad22fc23ae556c01adb415d7639efda1bbb23b9
This commit is contained in:
Paul Duffin
2021-03-22 09:15:22 +00:00
committed by Automerger Merge Worker
parent 3fa8037bde a1cf464f06
commit 605946671c
1 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apex/apex_test.go
View File

@@ -50,26 +50,23 @@ func names(s string) (ns []string) {
return return
} }
func testApexError(t *testing.T, pattern, bp string, handlers ...interface{}) { func testApexError(t *testing.T, pattern, bp string, preparers ...android.FixturePreparer) {
t.Helper() t.Helper()
testApexFixtureFactory(bp, handlers). apexFixtureFactory.Extend(preparers...).
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)). ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)).
RunTest(t) RunTestWithBp(t, bp)
} }
func testApex(t *testing.T, bp string, handlers ...interface{}) *android.TestContext { func testApex(t *testing.T, bp string, preparers ...android.FixturePreparer) *android.TestContext {
t.Helper() t.Helper()
result := testApexFixtureFactory(bp, handlers).RunTest(t) factory := apexFixtureFactory.Extend(preparers...)
if bp != "" {
factory = factory.Extend(android.FixtureWithRootAndroidBp(bp))
}
result := factory.RunTest(t)
return result.TestContext return result.TestContext
} }
// apex package specific mechanism for customizing the test configuration.
//
// Use FixturePreparer instances instead.
//
// deprecated
type testCustomizer func(fs map[string][]byte, config android.Config)
func withFiles(files android.MockFS) android.FixturePreparer { func withFiles(files android.MockFS) android.FixturePreparer {
return files.AddToFixture() return files.AddToFixture()
} }
@@ -210,32 +207,6 @@ var apexFixtureFactory = android.NewFixtureFactory(
}), }),
) )
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))
}
return factory
}
func setUp() { func setUp() {
var err error var err error
buildDir, err = ioutil.TempDir("", "soong_apex_test") buildDir, err = ioutil.TempDir("", "soong_apex_test")