Skip to content

Commit b82a826

Browse files
committed
test report
1 parent 128a183 commit b82a826

9 files changed

+358
-286
lines changed

.idea/workspace.xml

+141-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

formatter/formatter.go renamed to formatter.go

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package formatter
1+
package main
22

33
import (
44
"bufio"
@@ -8,8 +8,6 @@ import (
88
"runtime"
99
"strings"
1010
"time"
11-
12-
"github.com/jstemmer/go-junit-report/parser"
1311
)
1412

1513
// JUnitTestSuites is a collection of JUnit test suites.
@@ -60,7 +58,7 @@ type JUnitFailure struct {
6058

6159
// JUnitReportXML writes a JUnit xml representation of the given report to w
6260
// in the format described at http://windyroad.org/dl/Open%20Source/JUnit.xsd
63-
func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w io.Writer) error {
61+
func JUnitReportXML(report *Report, noXMLHeader bool, goVersion string, w io.Writer) error {
6462
suites := JUnitTestSuites{}
6563

6664
// convert Report to JUnit test suites
@@ -99,7 +97,7 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w
9997
Failure: nil,
10098
}
10199

102-
if test.Result == parser.FAIL {
100+
if test.Result == FAIL {
103101
ts.Failures++
104102
testCase.Failure = &JUnitFailure{
105103
Message: "Failed",
@@ -108,7 +106,7 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w
108106
}
109107
}
110108

111-
if test.Result == parser.SKIP {
109+
if test.Result == SKIP {
112110
testCase.SkipMessage = &JUnitSkipMessage{strings.Join(test.Output, "\n")}
113111
}
114112

@@ -148,12 +146,12 @@ func JUnitReportXML(report *parser.Report, noXMLHeader bool, goVersion string, w
148146
return nil
149147
}
150148

151-
func mergeBenchmarks(benchmarks []*parser.Benchmark) []*parser.Benchmark {
152-
var merged []*parser.Benchmark
153-
benchmap := make(map[string][]*parser.Benchmark)
149+
func mergeBenchmarks(benchmarks []*Benchmark) []*Benchmark {
150+
var merged []*Benchmark
151+
benchmap := make(map[string][]*Benchmark)
154152
for _, bm := range benchmarks {
155153
if _, ok := benchmap[bm.Name]; !ok {
156-
merged = append(merged, &parser.Benchmark{Name: bm.Name})
154+
merged = append(merged, &Benchmark{Name: bm.Name})
157155
}
158156
benchmap[bm.Name] = append(benchmap[bm.Name], bm)
159157
}

formatter/formatter_test.go renamed to formatter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package formatter
1+
package main
22

33
import (
44
"bytes"

go-junit-report.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import (
44
"flag"
55
"fmt"
66
"os"
7-
8-
"github.com/jstemmer/go-junit-report/formatter"
9-
"github.com/jstemmer/go-junit-report/parser"
107
)
118

129
var (
@@ -26,14 +23,14 @@ func main() {
2623
}
2724

2825
// Read input
29-
report, err := parser.Parse(os.Stdin, *packageName)
26+
report, err := Parse(os.Stdin, *packageName)
3027
if err != nil {
3128
fmt.Printf("Error reading input: %s\n", err)
3229
os.Exit(1)
3330
}
3431

3532
// Write xml
36-
err = formatter.JUnitReportXML(report, *noXMLHeader, *goVersionFlag, os.Stdout)
33+
err = JUnitReportXML(report, *noXMLHeader, *goVersionFlag, os.Stdout)
3734
if err != nil {
3835
fmt.Printf("Error writing XML: %s\n", err)
3936
os.Exit(1)

0 commit comments

Comments
 (0)