minor nits

This commit is contained in:
Yann Hamon 2020-06-01 12:24:45 +02:00
parent 8fc1df8d8b
commit 5ff2d1a037
2 changed files with 11 additions and 11 deletions

View file

@ -36,19 +36,20 @@ func (o *JSONOutput) Write(filename, kind, version string, err error, skipped bo
msg, st := "", "" msg, st := "", ""
s := status(err, skipped) s := status(err, skipped)
switch {
case s == VALID: switch s {
case VALID:
st = "VALID" st = "VALID"
o.nValid++ o.nValid++
case s == INVALID: case INVALID:
st = "INVALID" st = "INVALID"
msg = err.Error() msg = err.Error()
o.nInvalid++ o.nInvalid++
case s == ERROR: case ERROR:
st = "ERROR" st = "ERROR"
msg = err.Error() msg = err.Error()
o.nErrors++ o.nErrors++
case s == SKIPPED: case SKIPPED:
st = "SKIPPED" st = "SKIPPED"
o.nSkipped++ o.nSkipped++
} }

View file

@ -27,20 +27,19 @@ func (o *TextOutput) Write(filename, kind, version string, err error, skipped bo
o.Lock() o.Lock()
defer o.Unlock() defer o.Unlock()
s := status(err, skipped) switch status(err, skipped) {
switch { case VALID:
case s == VALID:
if !o.quiet { if !o.quiet {
fmt.Printf("%s - %s is valid\n", filename, kind) fmt.Printf("%s - %s is valid\n", filename, kind)
} }
o.nValid++ o.nValid++
case s == INVALID: case INVALID:
fmt.Printf("%s - %s is invalid: %s\n", filename, kind, err) fmt.Printf("%s - %s is invalid: %s\n", filename, kind, err)
o.nInvalid++ o.nInvalid++
case s == ERROR: case ERROR:
fmt.Printf("%s - %s failed validation: %s\n", filename, kind, err) fmt.Printf("%s - %s failed validation: %s\n", filename, kind, err)
o.nErrors++ o.nErrors++
case s == SKIPPED: case SKIPPED:
if !o.quiet { if !o.quiet {
fmt.Printf("%s - %s skipped\n", filename, kind) fmt.Printf("%s - %s skipped\n", filename, kind)
} }