Fix jacoco filters am: d7deceb8fa

am: 4e914d70cd

Change-Id: Id3b88c654f1c47d2c6948f727aa33611a4b3749b
This commit is contained in:
Colin Cross
2017-12-21 17:58:38 +00:00
committed by android-build-merger
2 changed files with 14 additions and 1 deletions

View File

@@ -113,6 +113,8 @@ func jacocoFilterToSpec(filter string) (string, error) {
spec += "**/*.class" spec += "**/*.class"
} else if wildcard { } else if wildcard {
spec += "*.class" spec += "*.class"
} else {
spec += ".class"
} }
return spec, nil return spec, nil

View File

@@ -20,6 +20,11 @@ func TestJacocoFilterToSpecs(t *testing.T) {
testCases := []struct { testCases := []struct {
name, in, out string name, in, out string
}{ }{
{
name: "class",
in: "package.Class",
out: "package/Class.class",
},
{ {
name: "class wildcard", name: "class wildcard",
in: "package.Class*", in: "package.Class*",
@@ -71,6 +76,12 @@ func TestJacocoFiltersToZipCommand(t *testing.T) {
includes: []string{"package/Class.class", "package2/Class.class"}, includes: []string{"package/Class.class", "package2/Class.class"},
out: "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 { for _, testCase := range testCases {