Remove uses of FixtureFactory from android package

Bug: 183235980
Test: m nothing
Change-Id: I72898ada020ee1a73fd534c61afb5c22fa00c1e5
This commit is contained in:
Paul Duffin
2021-03-20 00:36:14 +00:00
parent ff2aa69a86
commit 30ac3e7ca7
24 changed files with 108 additions and 117 deletions

View File

@@ -182,7 +182,7 @@ func TestProductVariables(t *testing.T) {
}
`
emptyTestFixtureFactory.RunTest(t,
GroupFixturePreparers(
FixtureModifyProductVariables(func(variables FixtureProductVariables) {
variables.Eng = proptools.BoolPtr(true)
}),
@@ -204,7 +204,7 @@ func TestProductVariables(t *testing.T) {
})
}),
FixtureWithRootAndroidBp(bp),
)
).RunTest(t)
}
var testProductVariableDefaultsProperties = struct {
@@ -288,7 +288,7 @@ func TestProductVariablesDefaults(t *testing.T) {
}
`
result := emptyTestFixtureFactory.RunTest(t,
result := GroupFixturePreparers(
FixtureModifyProductVariables(func(variables FixtureProductVariables) {
variables.Eng = boolPtr(true)
}),
@@ -299,7 +299,7 @@ func TestProductVariablesDefaults(t *testing.T) {
ctx.RegisterModuleType("defaults", productVariablesDefaultsTestDefaultsFactory)
}),
FixtureWithRootAndroidBp(bp),
)
).RunTest(t)
foo := result.ModuleForTests("foo", "").Module().(*productVariablesDefaultsTestModule)