From d27205e8dac0f583e77ef3a853fe4ff6347a53ac Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 12 Sep 2024 22:41:37 -0700 Subject: Convert test mutators to TransitionMutators Convert various mutators in tests to TransitionMutators. Bug: 319288033 Flag: EXEMPT refactor Test: all soong tests pass Change-Id: I1da55889c391582a7c825c118c5988ec27820237 --- android/singleton_module_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'android/singleton_module_test.go') diff --git a/android/singleton_module_test.go b/android/singleton_module_test.go index 3b1bf39e3..3b8c6b213 100644 --- a/android/singleton_module_test.go +++ b/android/singleton_module_test.go @@ -96,12 +96,6 @@ func TestUnusedSingletonModule(t *testing.T) { } } -func testVariantSingletonModuleMutator(ctx BottomUpMutatorContext) { - if _, ok := ctx.Module().(*testSingletonModule); ok { - ctx.CreateVariations("a", "b") - } -} - func TestVariantSingletonModule(t *testing.T) { if testing.Short() { t.Skip("test fails with data race enabled") @@ -116,7 +110,11 @@ func TestVariantSingletonModule(t *testing.T) { prepareForSingletonModuleTest, FixtureRegisterWithContext(func(ctx RegistrationContext) { ctx.PreDepsMutators(func(ctx RegisterMutatorsContext) { - ctx.BottomUp("test_singleton_module_mutator", testVariantSingletonModuleMutator) + ctx.Transition("test_singleton_module_mutator", &testTransitionMutator{ + split: func(ctx BaseModuleContext) []string { + return []string{"a", "b"} + }, + }) }) }), ). -- cgit v1.2.3-59-g8ed1b