Skip to content

Commit f2aabed

Browse files
committed
WIP: Minor refactor
1 parent 91adaa2 commit f2aabed

1 file changed

Lines changed: 14 additions & 10 deletions

File tree

pkg/output/cli.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,24 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
4141

4242
fileErrors := []string{}
4343
testResults := []runtime.TestResult{}
44-
4544
start := time.Now()
4645
for r := range results {
4746
if r.FileError != nil {
48-
str := fmt.Sprintf("[%s] %s!", r.FileName, r.FileError.Error())
49-
fileErrors = append(fileErrors, str)
47+
fileErrors = append(fileErrors, fmt.Sprintf("[%s] %s!", r.FileName, r.FileError.Error()))
5048
continue
5149
}
5250
testResults = append(testResults, r)
5351
}
5452
duration := time.Since(start)
5553

56-
if w.order { //maintain file order
54+
if w.order { //Maintain file order
5755
sort.SliceStable(testResults, func(i, j int) bool {
5856
return testResults[i].FileName < testResults[j].FileName
5957
})
6058
}
6159

6260
failed := 0
63-
// Print Results
64-
for _, r := range testResults {
61+
for _, r := range testResults { //Print results
6562
if r.ValidationResult.Success {
6663
str := fmt.Sprintf("✓ [%s] [%s] %s", r.FileName, r.Node, r.TestCase.Title)
6764
s := w.addTries(str, r)
@@ -91,11 +88,10 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
9188
w.fprintf(au.Green(summary))
9289
}
9390

94-
w.fprintf("")
95-
for _, e := range fileErrors {
96-
w.fprintf("File Errors:")
97-
w.fprintf(e)
91+
if len(fileErrors) > 0 {
92+
w.printFileErrors(fileErrors)
9893
}
94+
9995
return failed == 0
10096
}
10197

@@ -127,6 +123,14 @@ func (w *OutputWriter) printFailures(results []runtime.TestResult) {
127123
}
128124
}
129125

126+
func (w *OutputWriter) printFileErrors(errors []string) {
127+
w.fprintf("")
128+
for _, e := range errors {
129+
w.fprintf("File Errors:")
130+
w.fprintf(e)
131+
}
132+
}
133+
130134
func (w *OutputWriter) fprintf(a ...interface{}) {
131135
if _, err := fmt.Fprintln(w.out, a...); err != nil {
132136
log.Fatal(err)

0 commit comments

Comments
 (0)