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

Merge branch 'subpackage'

Browse Source
This commit is contained in:
Joël Stemmer 2015-07-01 22:31:23 +02:00
commit afd084b9d1
4 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go-junit-report.go
View File

@ -4,6 +4,8 @@ import (
"flag" "flag"
"fmt" "fmt"
"os" "os"
"github.com/jstemmer/go-junit-report/parser"
) )
var ( var (
@ -22,7 +24,7 @@ func main() {
flag.Parse() flag.Parse()
// Read input // Read input
report, err := Parse(os.Stdin, packageName) report, err := parser.Parse(os.Stdin, packageName)
if err != nil { if err != nil {
fmt.Printf("Error reading input: %s\n", err) fmt.Printf("Error reading input: %s\n", err)
os.Exit(1) os.Exit(1)

92
go-junit-report_test.go
View File

@ -8,12 +8,14 @@ import (
"runtime" "runtime"
"strings" "strings"
"testing" "testing"
"github.com/jstemmer/go-junit-report/parser"
) )
type TestCase struct { type TestCase struct {
name string name string
reportName string reportName string
report *Report report *parser.Report
noXMLHeader bool noXMLHeader bool
packageName string packageName string
} }
@ -22,22 +24,22 @@ var testCases = []TestCase{
{ {
name: "01-pass.txt", name: "01-pass.txt",
reportName: "01-report.xml", reportName: "01-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name", Name: "package/name",
Time: 160, Time: 160,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestZ", Name: "TestZ",
Time: 60, Time: 60,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
{ {
Name: "TestA", Name: "TestA",
Time: 100, Time: 100,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -48,16 +50,16 @@ var testCases = []TestCase{
{ {
name: "02-fail.txt", name: "02-fail.txt",
reportName: "02-report.xml", reportName: "02-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name", Name: "package/name",
Time: 151, Time: 151,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 20, Time: 20,
Result: FAIL, Result: parser.FAIL,
Output: []string{ Output: []string{
"file_test.go:11: Error message", "file_test.go:11: Error message",
"file_test.go:11: Longer", "file_test.go:11: Longer",
@ -68,7 +70,7 @@ var testCases = []TestCase{
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 130, Time: 130,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -79,16 +81,16 @@ var testCases = []TestCase{
{ {
name: "03-skip.txt", name: "03-skip.txt",
reportName: "03-report.xml", reportName: "03-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name", Name: "package/name",
Time: 150, Time: 150,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 20, Time: 20,
Result: SKIP, Result: parser.SKIP,
Output: []string{ Output: []string{
"file_test.go:11: Skip message", "file_test.go:11: Skip message",
}, },
@ -96,7 +98,7 @@ var testCases = []TestCase{
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 130, Time: 130,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -107,22 +109,22 @@ var testCases = []TestCase{
{ {
name: "04-go_1_4.txt", name: "04-go_1_4.txt",
reportName: "04-report.xml", reportName: "04-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name", Name: "package/name",
Time: 160, Time: 160,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 60, Time: 60,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 100, Time: 100,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -133,22 +135,22 @@ var testCases = []TestCase{
{ {
name: "05-no_xml_header.txt", name: "05-no_xml_header.txt",
reportName: "05-report.xml", reportName: "05-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name", Name: "package/name",
Time: 160, Time: 160,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 60, Time: 60,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 100, Time: 100,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -160,22 +162,22 @@ var testCases = []TestCase{
{ {
name: "06-mixed.txt", name: "06-mixed.txt",
reportName: "06-report.xml", reportName: "06-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "package/name1", Name: "package/name1",
Time: 160, Time: 160,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 60, Time: 60,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 100, Time: 100,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -183,11 +185,11 @@ var testCases = []TestCase{
{ {
Name: "package/name2", Name: "package/name2",
Time: 151, Time: 151,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 20, Time: 20,
Result: FAIL, Result: parser.FAIL,
Output: []string{ Output: []string{
"file_test.go:11: Error message", "file_test.go:11: Error message",
"file_test.go:11: Longer", "file_test.go:11: Longer",
@ -198,7 +200,7 @@ var testCases = []TestCase{
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 130, Time: 130,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -210,22 +212,22 @@ var testCases = []TestCase{
{ {
name: "07-compiled_test.txt", name: "07-compiled_test.txt",
reportName: "07-report.xml", reportName: "07-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "test/package", Name: "test/package",
Time: 160, Time: 160,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestOne", Name: "TestOne",
Time: 60, Time: 60,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
{ {
Name: "TestTwo", Name: "TestTwo",
Time: 100, Time: 100,
Result: PASS, Result: parser.PASS,
Output: []string{}, Output: []string{},
}, },
}, },
@ -237,22 +239,22 @@ var testCases = []TestCase{
{ {
name: "08-parallel.txt", name: "08-parallel.txt",
reportName: "08-report.xml", reportName: "08-report.xml",
report: &Report{ report: &parser.Report{
Packages: []Package{ Packages: []parser.Package{
{ {
Name: "github.com/dmitris/test-go-junit-report", Name: "github.com/dmitris/test-go-junit-report",
Time: 440, Time: 440,
Tests: []*Test{ Tests: []*parser.Test{
{ {
Name: "TestDoFoo", Name: "TestDoFoo",
Time: 270, Time: 270,
Result: PASS, Result: parser.PASS,
Output: []string{"cov_test.go:10: DoFoo log 1", "cov_test.go:10: DoFoo log 2"}, Output: []string{"cov_test.go:10: DoFoo log 1", "cov_test.go:10: DoFoo log 2"},
}, },
{ {
Name: "TestDoFoo2", Name: "TestDoFoo2",
Time: 160, Time: 160,
Result: PASS, Result: parser.PASS,
Output: []string{"cov_test.go:21: DoFoo2 log 1", "cov_test.go:21: DoFoo2 log 2"}, Output: []string{"cov_test.go:21: DoFoo2 log 1", "cov_test.go:21: DoFoo2 log 2"},
}, },
}, },
@ -338,7 +340,7 @@ func TestParser(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
report, err := Parse(file, testCase.packageName) report, err := parser.Parse(file, testCase.packageName)
if err != nil { if err != nil {
t.Fatalf("error parsing: %s", err) t.Fatalf("error parsing: %s", err)
} }

12
junit-formatter.go
View File

@ -7,6 +7,8 @@ import (
"io" "io"
"runtime" "runtime"
"strings" "strings"
"github.com/jstemmer/go-junit-report/parser"
) )
// JUnitTestSuites is a collection of JUnit test suites. // JUnitTestSuites is a collection of JUnit test suites.
@ -57,7 +59,7 @@ type JUnitFailure struct {
// JUnitReportXML writes a JUnit xml representation of the given report to w // 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 // in the format described at http://windyroad.org/dl/Open%20Source/JUnit.xsd
func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error { func JUnitReportXML(report *parser.Report, noXMLHeader bool, w io.Writer) error {
suites := JUnitTestSuites{} suites := JUnitTestSuites{}
// convert Report to JUnit test suites // convert Report to JUnit test suites
@ -91,7 +93,7 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
Failure: nil, Failure: nil,
} }
if test.Result == FAIL { if test.Result == parser.FAIL {
ts.Failures++ ts.Failures++
testCase.Failure = &JUnitFailure{ testCase.Failure = &JUnitFailure{
Message: "Failed", Message: "Failed",
@ -100,7 +102,7 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
} }
} }
if test.Result == SKIP { if test.Result == parser.SKIP {
testCase.SkipMessage = &JUnitSkipMessage{strings.Join(test.Output, "\n")} testCase.SkipMessage = &JUnitSkipMessage{strings.Join(test.Output, "\n")}
} }
@ -129,9 +131,9 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
return nil return nil
} }
func countFailures(tests []Test) (result int) { func countFailures(tests []parser.Test) (result int) {
for _, test := range tests { for _, test := range tests {
if test.Result == FAIL { if test.Result == parser.FAIL {
result++ result++
} }
} }

2
parser.go → parser/parser.go
View File

@ -1,4 +1,4 @@
package main package parser
import ( import (
"bufio" "bufio"