commit 30ac3e7ca75106d7f883558c46501296d4bffcfc
author Paul Duffin <paulduffin@google.com> Sat Mar 20 00:36:14 2021 +0000
committer Paul Duffin <paulduffin@google.com> Mon Mar 22 18:31:53 2021 +0000
tree 8fb0fadf5f85ff592c7ff56bdfb0a915d9ffa1b1
parent ff2aa69a86e46429255ed812b2796a89635b9f26

Remove uses of FixtureFactory from android package

Bug: 183235980
Test: m nothing
Change-Id: I72898ada020ee1a73fd534c61afb5c22fa00c1e5

android/soong_config_modules_test.go

diff --git a/android/soong_config_modules_test.go b/android/soong_config_modules_test.go
index a72b160..8f252d9 100644
--- a/android/soong_config_modules_test.go
+++ b/android/soong_config_modules_test.go
@@ -278,7 +278,7 @@
 
 		for _, tc := range testCases {
 			t.Run(tc.name, func(t *testing.T) {
-				result := emptyTestFixtureFactory.RunTest(t,
+				result := GroupFixturePreparers(
 					tc.preparer,
 					PrepareForTestWithDefaults,
 					FixtureRegisterWithContext(func(ctx RegistrationContext) {
@@ -291,7 +291,7 @@
 					}),
 					fs.AddToFixture(),
 					FixtureWithRootAndroidBp(bp),
-				)
+				).RunTest(t)
 
 				foo := result.ModuleForTests("foo", "").Module().(*soongConfigTestModule)
 				AssertDeepEquals(t, "foo cflags", tc.fooExpectedFlags, foo.props.Cflags)