Simplify preparers now that tests use consistent registration order
It is no longer necessary to use preparers in a specific order now that
the test infrastructure enforces a consistent registration order.
So, this change:
* Sorts preparers alphabetically to make them easier to maintain.
* Creates a single visiblity preparer for all the visibility mutators.
* Adds PrepareForTestWithPackageModule
Bug: 181070625
Bug: 181953909
Test: m nothing
Change-Id: I9e65dd182be664d8d0d5db7ccc0b63fa315129c8
diff --git a/android/testing.go b/android/testing.go
index 2c24372..2992678 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -75,15 +75,16 @@
// Prepares an integration test with build components from the android package.
var PrepareForIntegrationTestWithAndroid = GroupFixturePreparers(
- // Mutators. Must match order in mutator.go.
+ // Sorted alphabetically as the actual order does not matter as tests automatically enforce the
+ // correct order.
PrepareForTestWithArchMutator,
- PrepareForTestWithDefaults,
PrepareForTestWithComponentsMutator,
- PrepareForTestWithPrebuilts,
- PrepareForTestWithOverrides,
-
- // Modules
+ PrepareForTestWithDefaults,
PrepareForTestWithFilegroup,
+ PrepareForTestWithOverrides,
+ PrepareForTestWithPackageModule,
+ PrepareForTestWithPrebuilts,
+ PrepareForTestWithVisibility,
)
func NewTestArchContext(config Config) *TestContext {