diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-24 13:41:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-24 13:41:56 +0000 |
| commit | a1063c09f6f47b68d946ff61cef71692b19d48e5 (patch) | |
| tree | a1be7c412465805e9f73851383158e22cf2f85e4 /java/java_test.go | |
| parent | 70204f9fc914f53ab85cf277b50abc6748234691 (diff) | |
| parent | 9fc9f53423d59adc9c7f249fcbb6d0f3a44952bd (diff) | |
Merge changes I94f66e3e,I233a4fe1,Idbb37485
* changes:
Group all the preparations needed for testing dexpreopt
Separate methods used for fixture based and legacy tests
Use more inclusive language in dexpreopt/testing.go
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 4 |
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 |