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

Add test for java generated sources

Browse Source 
Bug: 67364649
Test: TestGeneratedSources
Change-Id: I5400e4b013dc47c04b9d32787e50c5281033484d
This commit is contained in:
Colin Cross
2017-10-09 15:34:10 -07:00
parent 52b1e4cf06
commit 54190b3b13
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
genrule/genrule.go
View File

@@ -28,8 +28,8 @@ import (
) )
func init() { func init() {
android.RegisterModuleType("gensrcs", genSrcsFactory) android.RegisterModuleType("gensrcs", GenSrcsFactory)
android.RegisterModuleType("genrule", genRuleFactory) android.RegisterModuleType("genrule", GenRuleFactory)
} }
var ( var (
@@ -331,7 +331,7 @@ func NewGenSrcs() *Module {
return generatorFactory(tasks, properties) return generatorFactory(tasks, properties)
} }
func genSrcsFactory() android.Module { func GenSrcsFactory() android.Module {
m := NewGenSrcs() m := NewGenSrcs()
android.InitAndroidModule(m) android.InitAndroidModule(m)
return m return m
@@ -361,7 +361,7 @@ func NewGenRule() *Module {
return generatorFactory(tasks, properties) return generatorFactory(tasks, properties)
} }
func genRuleFactory() android.Module { func GenRuleFactory() android.Module {
m := NewGenRule() m := NewGenRule()
android.InitAndroidModule(m) android.InitAndroidModule(m)
return m return m

34
java/java_test.go
View File

@@ -61,6 +61,7 @@ func testJava(t *testing.T, bp string) *android.TestContext {
ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory)) ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory))
ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory))
ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(genrule.FileGroupFactory)) ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(genrule.FileGroupFactory))
ctx.RegisterModuleType("genrule", android.ModuleFactoryAdaptor(genrule.GenRuleFactory))
ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators)
ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators) ctx.PreArchMutators(android.RegisterPrebuiltsPostDepsMutators)
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
@@ -506,6 +507,39 @@ func TestExcludeResources(t *testing.T) {
} }
} }
func TestGeneratedSources(t *testing.T) {
ctx := testJava(t, `
java_library {
name: "foo",
srcs: [
"a*.java",
":gen",
"b*.java",
],
}
genrule {
name: "gen",
tool_files: ["res/a"],
out: ["gen.java"],
}
`)
javac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
genrule := ctx.ModuleForTests("gen", "").Rule("generator")
if len(genrule.Outputs) != 1 || filepath.Base(genrule.Outputs[0].String()) != "gen.java" {
t.Fatalf(`gen output file %v is not [".../gen.java"]`, genrule.Outputs.Strings())
}
if len(javac.Inputs) != 3 ||
javac.Inputs[0].String() != "a.java" ||
javac.Inputs[1].String() != genrule.Outputs[0].String() ||
javac.Inputs[2].String() != "b.java" {
t.Errorf(`foo inputs %v != ["a.java", ".../gen.java", "b.java"]`, javac.Inputs)
}
}
func fail(t *testing.T, errs []error) { func fail(t *testing.T, errs []error) {
if len(errs) > 0 { if len(errs) > 0 {
for _, err := range errs { for _, err := range errs {