erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-11 01:57:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

test/utils: BeValidJSON should not error on invalid json

Browse source 
Match() returned the unmarshal error for input that is simply not json.
Gomega treats a non nil error as a failure to evaluate, so it fails the
assertion either way and ToNot(BeValidJSON()) fails on exactly the input
it is meant to accept:

  Expect("{not json").ToNot(BeValidJSON())
  --> invalid character 'n' looking for beginning of object key string

A non match is (false, nil), the error return is for input the matcher
cannot evaluate, which is the wrong type case above it.

Signed-off-by: Tushar Verma <tusharmyself06@gmail.com>
This commit is contained in:
Tushar Verma 2026-08-26 16:45:35 +05:30
parent fb1cb4fa6e
commit d685b5a87b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/utils/matchers.go
View file

@ -145,6 +145,8 @@ func (matcher *exitCleanlyMatcher) NegatedFailureMessage(_ any) (message string)
type ValidJSONMatcher struct {
types.GomegaMatcher
// err is why the input was not valid JSON, reported in FailureMessage.
err error
}
func BeValidJSON() *ValidJSONMatcher {
@ -159,13 +161,17 @@ func (matcher *ValidJSONMatcher) Match(actual any) (success bool, err error) {
var i any
if err := json.Unmarshal([]byte(s), &i); err != nil {
return false, err
// Not valid JSON is a mismatch, not a failure to evaluate. Returning
// the error here makes ToNot(BeValidJSON()) fail on exactly the input
// it is meant to accept, so keep it for FailureMessage instead.
matcher.err = err
return false, nil //nolint:nilerr // reported by FailureMessage
}
return true, nil
}
func (matcher *ValidJSONMatcher) FailureMessage(actual any) (message string) {
return format.Message(actual, "to be valid JSON")
return format.Message(actual, fmt.Sprintf("to be valid JSON: %v", matcher.err))
}
func (matcher *ValidJSONMatcher) NegatedFailureMessage(actual any) (message string) {