diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-29 02:06:19 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-31 16:03:59 +0100 |
| commit | 55e740e9a684619ec398b72036cf6739fa499940 (patch) | |
| tree | dc3d7317b6848bbb5f80aea4489c02a0d6310846 /java/system_modules_test.go | |
| parent | 4f6d15465b5576ebc764ac39e2f3caa903a2747d (diff) | |
Remove varargs from RunTest(t *testing.T)
Use GroupFixturePreparers instead.
Bug: 182885307
Test: m nothing
Change-Id: Iaedb0ddc9d6a704f4d41363e705f3025a1291dc8
Diffstat (limited to 'java/system_modules_test.go')
| -rw-r--r-- | java/system_modules_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
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") |