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

parser/gotest: Only set TimestampFunc when it's not nil

Browse Source 
Otherwise the ReportBuilder won't generate a timestamp.
This commit is contained in:
Joël Stemmer 2022-03-30 23:55:11 +01:00
parent 6e3153dd44
commit 75d0972dd6
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/parser/gotest/gotest.go
View File

@ -87,7 +87,9 @@ func (p *Parser) Parse(r io.Reader) (gtr.Report, error) {
func (p *Parser) report(events []Event) gtr.Report { func (p *Parser) report(events []Event) gtr.Report {
rb := newReportBuilder() rb := newReportBuilder()
rb.PackageName = p.packageName rb.PackageName = p.packageName
rb.TimestampFunc = p.timestampFunc if p.timestampFunc != nil {
rb.TimestampFunc = p.timestampFunc
}
for _, ev := range events { for _, ev := range events {
switch ev.Type { switch ev.Type {
case "run_test": case "run_test":

24
pkg/parser/gotest/gotest_test.go
View File

@ -10,6 +10,10 @@ import (
"github.com/jstemmer/go-junit-report/v2/pkg/gtr" "github.com/jstemmer/go-junit-report/v2/pkg/gtr"
) )
var (
testTimestamp = time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
)
type parseLineTest struct { type parseLineTest struct {
input string input string
events interface{} events interface{}
@ -220,8 +224,9 @@ func TestReport(t *testing.T) {
expected := gtr.Report{ expected := gtr.Report{
Packages: []gtr.Package{ Packages: []gtr.Package{
{ {
Name: "package/name", Name: "package/name",
Duration: 1 * time.Millisecond, Duration: 1 * time.Millisecond,
Timestamp: testTimestamp,
Tests: []gtr.Test{ Tests: []gtr.Test{
{ {
Name: "TestOne", Name: "TestOne",
@ -239,8 +244,9 @@ func TestReport(t *testing.T) {
}, },
}, },
{ {
Name: "package/name2", Name: "package/name2",
Duration: 1 * time.Millisecond, Duration: 1 * time.Millisecond,
Timestamp: testTimestamp,
Tests: []gtr.Test{ Tests: []gtr.Test{
{ {
Name: "TestOne", Name: "TestOne",
@ -253,8 +259,9 @@ func TestReport(t *testing.T) {
}, },
}, },
{ {
Name: "package/name3", Name: "package/name3",
Duration: 1234 * time.Millisecond, Duration: 1234 * time.Millisecond,
Timestamp: testTimestamp,
Benchmarks: []gtr.Benchmark{ Benchmarks: []gtr.Benchmark{
{ {
Name: "BenchmarkOne", Name: "BenchmarkOne",
@ -270,7 +277,8 @@ func TestReport(t *testing.T) {
Output: []string{"goarch: amd64"}, Output: []string{"goarch: amd64"},
}, },
{ {
Name: "package/failing1", Name: "package/failing1",
Timestamp: testTimestamp,
BuildError: gtr.Error{ BuildError: gtr.Error{
Name: "package/failing1", Name: "package/failing1",
Cause: "[build failed]", Cause: "[build failed]",
@ -280,7 +288,7 @@ func TestReport(t *testing.T) {
}, },
} }
parser := &Parser{} parser := New(TimestampFunc(func() time.Time { return testTimestamp }))
actual := parser.report(events) actual := parser.report(events)
if diff := cmp.Diff(actual, expected); diff != "" { if diff := cmp.Diff(actual, expected); diff != "" {
t.Errorf("FromEvents report incorrect, diff (-got, +want):\n%v", diff) t.Errorf("FromEvents report incorrect, diff (-got, +want):\n%v", diff)