StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove javaFixtureFactory

Browse Source 
Replaces uses of javaFixtureFactory with prepareForJavaTest and removes
the unused javaFixtureFactory.

Bug: 182885307
Test: m nothing
Change-Id: I809772d14af2af211b9e15ad676fbdc06b07cd46
This commit is contained in:
Paul Duffin
2021-03-22 15:36:52 +00:00
parent d6339af0b6
commit 71ae59412b
7 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/system_modules_test.go
View File

@@ -50,7 +50,7 @@ var addSourceSystemModules = android.FixtureAddTextFile("source/Android.bp", `
`)
func TestJavaSystemModules(t *testing.T) {
result := javaFixtureFactory.RunTest(t, addSourceSystemModules)
result := prepareForJavaTest.RunTest(t, addSourceSystemModules)
// 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 := javaFixtureFactory.RunTest(t, addPrebuiltSystemModules)
result := prepareForJavaTest.RunTest(t, addPrebuiltSystemModules)
// check the existence of the renamed prebuilt module
prebuiltSystemModules := result.ModuleForTests("system-modules", "android_common")
@@ -89,7 +89,7 @@ func TestJavaSystemModulesImport(t *testing.T) {
}
func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
result := javaFixtureFactory.RunTest(t,
result := prepareForJavaTest.RunTest(t,
addSourceSystemModules,
addPrebuiltSystemModules,
)