summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-03-23 15:41:11 +0000
committerPaul Duffin <paulduffin@google.com>2021-03-24 08:30:27 +0000
commit9fc9f53423d59adc9c7f249fcbb6d0f3a44952bd (patch)
treebf00bc7993b6db3364c08b191a0c445a3b5bedd8 /java/java_test.go
parent3c84eaaa984805936e71d678ffd67032beefb2c8 (diff)
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
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go4
1 files changed, 2 insertions, 2 deletions
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