nhyatt/go-junit-report
1
0
Fork 0
mirror of https://github.com/jstemmer/go-junit-report.git synced 2025-04-05 05:00:15 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from nmiyake/addGoVersionFlag

Browse Source 
Add "go-version" flag
This commit is contained in:
Joël Stemmer 2017-03-26 23:57:37 +01:00 committed by GitHub
commit baff58700e
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go-junit-report.go
View File

@ -11,12 +11,14 @@ import (
var (
noXMLHeader bool
packageName string
goVersionFlag string
setExitCode bool
)
func init() {
flag.BoolVar(&noXMLHeader, "no-xml-header", false, "do not print xml header")
flag.StringVar(&packageName, "package-name", "", "specify a package name (compiled test have no package name in output)")
flag.StringVar(&goVersionFlag, "go-version", "", "specify the value to use for the go.version property in the generated XML")
flag.BoolVar(&setExitCode, "set-exit-code", false, "set exit code to 1 if tests failed")
}
@ -31,7 +33,7 @@ func main() {
}
// Write xml
err = JUnitReportXML(report, noXMLHeader, os.Stdout)
err = JUnitReportXML(report, noXMLHeader, goVersionFlag, os.Stdout)
if err != nil {
fmt.Printf("Error writing XML: %s\n", err)
os.Exit(1)

21
go-junit-report_test.go
View File

@ -556,15 +556,23 @@ func TestParser(t *testing.T) {
}
func TestJUnitFormatter(t *testing.T) {
testJUnitFormatter(t, "")
}
func TestVersionFlag(t *testing.T) {
testJUnitFormatter(t, "custom-version")
}
func testJUnitFormatter(t *testing.T, goVersion string) {
for _, testCase := range testCases {
report, err := loadTestReport(testCase.reportName)
report, err := loadTestReport(testCase.reportName, goVersion)
if err != nil {
t.Fatal(err)
}
var junitReport bytes.Buffer
if err = JUnitReportXML(testCase.report, testCase.noXMLHeader, &junitReport); err != nil {
if err = JUnitReportXML(testCase.report, testCase.noXMLHeader, goVersion, &junitReport); err != nil {
t.Fatal(err)
}
@ -574,14 +582,19 @@ func TestJUnitFormatter(t *testing.T) {
}
}
func loadTestReport(name string) (string, error) {
func loadTestReport(name, goVersion string) (string, error) {
contents, err := ioutil.ReadFile("tests/" + name)
if err != nil {
return "", err
}
if goVersion == "" {
// if goVersion is not specified, default to runtime version
goVersion = runtime.Version()
}
// replace value="1.0" With actual version
report := strings.Replace(string(contents), `value="1.0"`, fmt.Sprintf(`value="%s"`, runtime.Version()), -1)
report := strings.Replace(string(contents), `value="1.0"`, fmt.Sprintf(`value="%s"`, goVersion), -1)
return report, nil
}

8
junit-formatter.go
View File

@ -59,7 +59,7 @@ type JUnitFailure struct {
// JUnitReportXML writes a JUnit xml representation of the given report to w
// in the format described at http://windyroad.org/dl/Open%20Source/JUnit.xsd
func JUnitReportXML(report *parser.Report, noXMLHeader bool, w io.Writer) error {
func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w io.Writer) error {
suites := JUnitTestSuites{}
// convert Report to JUnit test suites
@ -79,7 +79,11 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, w io.Writer) error
}
// properties
ts.Properties = append(ts.Properties, JUnitProperty{"go.version", runtime.Version()})
if goVersion == "" {
// if goVersion was not specified as a flag, fall back to version reported by runtime
goVersion = runtime.Version()
}
ts.Properties = append(ts.Properties, JUnitProperty{"go.version", goVersion})
if pkg.CoveragePct != "" {
ts.Properties = append(ts.Properties, JUnitProperty{"coverage.statements.pct", pkg.CoveragePct})
}