Skip to content

Commit

Permalink
Clean up reporting
Browse files Browse the repository at this point in the history
Signed-off-by: Hamish Hutchings <[email protected]>
  • Loading branch information
moredhel committed Jun 25, 2021
1 parent 3467370 commit 23f5a01
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions output/standard.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func (s *Standard) Output(results []CheckResult) error {

var totalFailures int
var totalExceptions int
var totalExclusions int
var totalWarnings int
var totalSuccesses int
var totalSkipped int
Expand Down Expand Up @@ -96,11 +97,12 @@ func (s *Standard) Output(results []CheckResult) error {
totalFailures += len(result.Failures)
totalExceptions += len(result.Exceptions)
totalWarnings += len(result.Warnings)
totalExclusions += len(result.Excludes)
totalSkipped += len(result.Skipped)
totalSuccesses += result.Successes
}

totalTests := totalFailures + totalExceptions + totalWarnings + totalSuccesses + totalSkipped
totalTests := totalFailures + totalExceptions + totalWarnings + totalSuccesses + totalExclusions + totalSkipped

var pluralSuffixTests string
if totalTests != 1 {
Expand All @@ -122,12 +124,18 @@ func (s *Standard) Output(results []CheckResult) error {
pluralSuffixExceptions = "s"
}

outputText := fmt.Sprintf("%v test%s, %v passed, %v warning%s, %v failure%s, %v exception%s",
var pluralSuffixExclusions string
if totalExclusions != 1 {
pluralSuffixExclusions = "s"
}

outputText := fmt.Sprintf("%v test%s, %v passed, %v warning%s, %v failure%s, %v exception%s, %v exclusion%s",
totalTests, pluralSuffixTests,
totalSuccesses,
totalWarnings, pluralSuffixWarnings,
totalFailures, pluralSuffixFailures,
totalExceptions, pluralSuffixExceptions,
totalExclusions, pluralSuffixExclusions,
)

if s.ShowSkipped {
Expand Down

0 comments on commit 23f5a01

Please sign in to comment.