From 55e740e9a684619ec398b72036cf6739fa499940 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 29 Mar 2021 02:06:19 +0100 Subject: Remove varargs from RunTest(t *testing.T) Use GroupFixturePreparers instead. Bug: 182885307 Test: m nothing Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8 --- java/java_test.go | 7 ++++++- java/system_modules_test.go | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'java') diff --git a/java/java_test.go b/java/java_test.go index d1d26ba00..3aafdda75 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -845,7 +845,12 @@ func TestJavaSdkLibraryEnforce(t *testing.T) { if expectedErrorPattern != "" { errorHandler = android.FixtureExpectsAtLeastOneErrorMatchingPattern(expectedErrorPattern) } - prepareForJavaTest.ExtendWithErrorHandler(errorHandler).RunTest(t, createPreparer(info)) + android.GroupFixturePreparers( + prepareForJavaTest, + createPreparer(info), + ). + ExtendWithErrorHandler(errorHandler). + RunTest(t) }) } diff --git a/java/system_modules_test.go b/java/system_modules_test.go index 120bbf7f5..7b5a3867e 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -50,7 +50,7 @@ var addSourceSystemModules = android.FixtureAddTextFile("source/Android.bp", ` `) func TestJavaSystemModules(t *testing.T) { - result := prepareForJavaTest.RunTest(t, addSourceSystemModules) + result := android.GroupFixturePreparers(prepareForJavaTest, addSourceSystemModules).RunTest(t) // check the existence of the source module sourceSystemModules := result.ModuleForTests("system-modules", "android_common") @@ -77,7 +77,7 @@ var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp" `) func TestJavaSystemModulesImport(t *testing.T) { - result := prepareForJavaTest.RunTest(t, addPrebuiltSystemModules) + result := android.GroupFixturePreparers(prepareForJavaTest, addPrebuiltSystemModules).RunTest(t) // check the existence of the renamed prebuilt module prebuiltSystemModules := result.ModuleForTests("system-modules", "android_common") @@ -89,10 +89,11 @@ func TestJavaSystemModulesImport(t *testing.T) { } func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { - result := prepareForJavaTest.RunTest(t, + result := android.GroupFixturePreparers( + prepareForJavaTest, addSourceSystemModules, addPrebuiltSystemModules, - ) + ).RunTest(t) // check the existence of the source module sourceSystemModules := result.ModuleForTests("system-modules", "android_common") -- cgit v1.2.3-59-g8ed1b