Java test code clean-up

Remove unused parameters and make testJava return the config.

Test: Ran all java tests.
Change-Id: Iaa123f3fd93188e2f55452b887e1d340429cc710
This commit is contained in:
Jaewoong Jung
2019-07-17 11:15:09 -07:00
parent 63f4b57a7f
commit f9a0443a9c
9 changed files with 66 additions and 77 deletions

View File

@@ -50,9 +50,7 @@ func TestDeviceForHost(t *testing.T) {
}
`
config := testConfig(nil)
ctx := testContext(config, bp, nil)
run(t, ctx, config)
ctx, config := testJava(t, bp)
deviceModule := ctx.ModuleForTests("device_module", "android_common")
deviceTurbineCombined := deviceModule.Output("turbine-combined/device_module.jar")
@@ -133,9 +131,7 @@ func TestHostForDevice(t *testing.T) {
}
`
config := testConfig(nil)
ctx := testContext(config, bp, nil)
run(t, ctx, config)
ctx, config := testJava(t, bp)
hostModule := ctx.ModuleForTests("host_module", config.BuildOsCommonVariant)
hostJavac := hostModule.Output("javac/host_module.jar")