Skip to content

Refactored basfmt and junitFormatter to support concurrency #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l3pp4rd merged 7 commits into from
Jan 31, 2020
+408 −160
Merged

Refactored basfmt and junitFormatter to support concurrency #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a762a8
Refactored basfmt and junitFormatter to support concurrency
lonnblad Jan 19, 2020
f988d26
fixed an issue with calculating durations
lonnblad Jan 19, 2020
6f6ffc5
Fixed an issue when executing empty Features or Scenarios
lonnblad Jan 20, 2020
21c17cb
Fixed a bad merge
lonnblad Jan 20, 2020
32feb1d
Added testcase for Junit in concurrent mode
lonnblad Jan 20, 2020
10ac715
Fixed another time calc issue and added a Junit Concurrency run test
lonnblad Jan 20, 2020
46ec5fd
a try to make the Junit test to pass on older go versions
lonnblad Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 47 additions & 3 deletions fmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ type Formatter interface {
Summary()
}

// ConcurrentFormatter is an interface for a Concurrent
// version of the Formatter interface.
type ConcurrentFormatter interface {
Formatter
Copy(ConcurrentFormatter)
Sync(ConcurrentFormatter)
}

// FormatterFunc builds a formatter with given
// suite name and io.Writer to record output
type FormatterFunc func(string, io.Writer) Formatter
Expand Down Expand Up @@ -156,6 +164,7 @@ type stepResult struct {
feature *feature
owner interface{}
step *gherkin.Step
time time.Time
def *StepDef
err error
}
Expand Down Expand Up @@ -213,6 +222,8 @@ func (f stepResult) scenarioLine() string {
}

type basefmt struct {
suiteName string

out io.Writer
owner interface{}
indent int
Expand All @@ -228,10 +239,28 @@ type basefmt struct {

func (f *basefmt) Node(n interface{}) {
switch t := n.(type) {
case *gherkin.TableRow:
f.owner = t
case *gherkin.Scenario:
f.owner = t
feature := f.features[len(f.features)-1]
feature.Scenarios = append(feature.Scenarios, &scenario{Name: t.Name, time: timeNowFunc()})
case *gherkin.ScenarioOutline:
feature := f.features[len(f.features)-1]
feature.Scenarios = append(feature.Scenarios, &scenario{OutlineName: t.Name})
case *gherkin.TableRow:
f.owner = t

feature := f.features[len(f.features)-1]
lastExample := feature.Scenarios[len(feature.Scenarios)-1]

newExample := scenario{OutlineName: lastExample.OutlineName, ExampleNo: lastExample.ExampleNo + 1, time: timeNowFunc()}
newExample.Name = fmt.Sprintf("%s #%d", newExample.OutlineName, newExample.ExampleNo)

const firstExample = 1
if newExample.ExampleNo == firstExample {
feature.Scenarios[len(feature.Scenarios)-1] = &newExample
} else {
feature.Scenarios = append(feature.Scenarios, &newExample)
}
}
}

Expand All @@ -240,7 +269,7 @@ func (f *basefmt) Defined(*gherkin.Step, *StepDef) {
}

func (f *basefmt) Feature(ft *gherkin.Feature, p string, c []byte) {
f.features = append(f.features, &feature{Path: p, Feature: ft})
f.features = append(f.features, &feature{Path: p, Feature: ft, time: timeNowFunc()})
}

func (f *basefmt) Passed(step *gherkin.Step, match *StepDef) {
Expand All @@ -250,8 +279,11 @@ func (f *basefmt) Passed(step *gherkin.Step, match *StepDef) {
step: step,
def: match,
typ: passed,
time: timeNowFunc(),
}
f.passed = append(f.passed, s)

f.features[len(f.features)-1].appendStepResult(s)
}

func (f *basefmt) Skipped(step *gherkin.Step, match *StepDef) {
Expand All @@ -261,8 +293,11 @@ func (f *basefmt) Skipped(step *gherkin.Step, match *StepDef) {
step: step,
def: match,
typ: skipped,
time: timeNowFunc(),
}
f.skipped = append(f.skipped, s)

f.features[len(f.features)-1].appendStepResult(s)
}

func (f *basefmt) Undefined(step *gherkin.Step, match *StepDef) {
Expand All @@ -272,8 +307,11 @@ func (f *basefmt) Undefined(step *gherkin.Step, match *StepDef) {
step: step,
def: match,
typ: undefined,
time: timeNowFunc(),
}
f.undefined = append(f.undefined, s)

f.features[len(f.features)-1].appendStepResult(s)
}

func (f *basefmt) Failed(step *gherkin.Step, match *StepDef, err error) {
Expand All @@ -284,8 +322,11 @@ func (f *basefmt) Failed(step *gherkin.Step, match *StepDef, err error) {
def: match,
err: err,
typ: failed,
time: timeNowFunc(),
}
f.failed = append(f.failed, s)

f.features[len(f.features)-1].appendStepResult(s)
}

func (f *basefmt) Pending(step *gherkin.Step, match *StepDef) {
Expand All @@ -295,8 +336,11 @@ func (f *basefmt) Pending(step *gherkin.Step, match *StepDef) {
step: step,
def: match,
typ: pending,
time: timeNowFunc(),
}
f.pending = append(f.pending, s)

f.features[len(f.features)-1].appendStepResult(s)
}

func (f *basefmt) Summary() {
Expand Down
Loading