From 9fc9f53423d59adc9c7f249fcbb6d0f3a44952bd Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 23 Mar 2021 15:41:11 +0000 Subject: Group all the preparations needed for testing dexpreopt Make it easier to test dexpreopt functionality by grouping all the fixture preparations together. Bug: 177892522 Test: m nothing Change-Id: I94f66e3ec82efc4fd791f4fdab678d298565e452 --- java/java_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index b6f639f98..31eeb6b05 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -53,7 +53,7 @@ var prepareForJavaTest = android.GroupFixturePreparers( android.FixtureRegisterWithContext(func(ctx android.RegistrationContext) { ctx.RegisterPreSingletonType("sdk_versions", sdkPreSingletonFactory) }), - dexpreopt.PrepareForTestWithDexpreopt, + PrepareForTestWithDexpreopt, ) func TestMain(m *testing.M) { @@ -68,7 +68,7 @@ func TestMain(m *testing.M) { func testJavaError(t *testing.T, pattern string, bp string) (*android.TestContext, android.Config) { t.Helper() result := android.GroupFixturePreparers( - prepareForJavaTest, dexpreopt.PrepareForTestWithDexpreopt). + prepareForJavaTest, dexpreopt.PrepareForTestByEnablingDexpreopt). ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)). RunTestWithBp(t, bp) return result.TestContext, result.Config -- cgit v1.2.3-59-g8ed1b