summaryrefslogtreecommitdiff
path: root/android/module_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-03-20 00:36:14 +0000
committer Paul Duffin <paulduffin@google.com> 2021-03-22 18:31:53 +0000
commit30ac3e7ca75106d7f883558c46501296d4bffcfc (patch)
tree8fb0fadf5f85ff592c7ff56bdfb0a915d9ffa1b1 /android/module_test.go
parentff2aa69a86e46429255ed812b2796a89635b9f26 (diff)
Remove uses of FixtureFactory from android package
Bug: 183235980 Test: m nothing Change-Id: I72898ada020ee1a73fd534c61afb5c22fa00c1e5
Diffstat (limited to 'android/module_test.go')
-rw-r--r--android/module_test.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/android/module_test.go b/android/module_test.go
index 99bf30afc..9ac929179 100644
--- a/android/module_test.go
+++ b/android/module_test.go
@@ -179,11 +179,9 @@ func TestErrorDependsOnDisabledModule(t *testing.T) {
}
`
- emptyTestFixtureFactory.
+ prepareForModuleTests.
ExtendWithErrorHandler(FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo": depends on disabled module "bar"`)).
- RunTest(t,
- prepareForModuleTests,
- FixtureWithRootAndroidBp(bp))
+ RunTestWithBp(t, bp)
}
func TestValidateCorrectBuildParams(t *testing.T) {
@@ -268,9 +266,7 @@ func TestDistErrorChecking(t *testing.T) {
"\\QAndroid.bp:18:17: module \"foo\": dists[1].suffix: Suffix may not contain a '/' character.\\E",
}
- emptyTestFixtureFactory.
+ prepareForModuleTests.
ExtendWithErrorHandler(FixtureExpectsAllErrorsToMatchAPattern(expectedErrs)).
- RunTest(t,
- prepareForModuleTests,
- FixtureWithRootAndroidBp(bp))
+ RunTestWithBp(t, bp)
}