Fix jacoco filters
Add space after -x argument for jacoco excludes.
Add .class to end of file name for jacoco includes.
Bug: 64836607
Test: jacoco_test.go
Change-Id: I4c1024755882c976f7326f7382c4f2e99a20233d
diff --git a/java/jacoco.go b/java/jacoco.go
index c4b3e6e..59f2fd3 100644
--- a/java/jacoco.go
+++ b/java/jacoco.go
@@ -76,7 +76,7 @@
func jacocoFiltersToZipCommand(includes, excludes []string) string {
specs := ""
if len(excludes) > 0 {
- specs += android.JoinWithPrefix(excludes, "-x") + " "
+ specs += android.JoinWithPrefix(excludes, "-x ") + " "
}
if len(includes) > 0 {
specs += strings.Join(includes, " ")
@@ -113,6 +113,8 @@
spec += "**/*.class"
} else if wildcard {
spec += "*.class"
+ } else {
+ spec += ".class"
}
return spec, nil
diff --git a/java/jacoco_test.go b/java/jacoco_test.go
index 8321017..6e8b026 100644
--- a/java/jacoco_test.go
+++ b/java/jacoco_test.go
@@ -21,6 +21,11 @@
name, in, out string
}{
{
+ name: "class",
+ in: "package.Class",
+ out: "package/Class.class",
+ },
+ {
name: "class wildcard",
in: "package.Class*",
out: "package/Class*.class",
@@ -71,6 +76,12 @@
includes: []string{"package/Class.class", "package2/Class.class"},
out: "package/Class.class package2/Class.class",
},
+ {
+ name: "excludes",
+ includes: []string{"package/**/*.class"},
+ excludes: []string{"package/Class.class"},
+ out: "-x package/Class.class package/**/*.class",
+ },
}
for _, testCase := range testCases {