diff options
author | Ed Santiago <santiago@redhat.com> | 2021-11-30 10:00:17 -0700 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2021-11-30 10:13:16 -0700 |
commit | 8eb0be0a29a647308b3ed9eab2126e1004b6ba85 (patch) | |
tree | d1e806225b1f1fe93feac0932fc61507f163f322 /test/utils | |
parent | f7cbb1d8451ae8b9b338aa416e443517a326edba (diff) | |
download | podman-8eb0be0a29a647308b3ed9eab2126e1004b6ba85.tar.gz podman-8eb0be0a29a647308b3ed9eab2126e1004b6ba85.tar.bz2 podman-8eb0be0a29a647308b3ed9eab2126e1004b6ba85.zip |
a few more manual BeTrue cleanups
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/utils')
-rw-r--r-- | test/utils/matchers.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/utils/matchers.go b/test/utils/matchers.go index 59436a3ab..288779b63 100644 --- a/test/utils/matchers.go +++ b/test/utils/matchers.go @@ -168,18 +168,18 @@ func (matcher *ExitMatcher) MatchMayChangeInTheFuture(actual interface{}) bool { return true } -type validJSONMatcher struct { +type ValidJSONMatcher struct { types.GomegaMatcher } -func BeValidJSON() *validJSONMatcher { - return &validJSONMatcher{} +func BeValidJSON() *ValidJSONMatcher { + return &ValidJSONMatcher{} } -func (matcher *validJSONMatcher) Match(actual interface{}) (success bool, err error) { +func (matcher *ValidJSONMatcher) Match(actual interface{}) (success bool, err error) { s, ok := actual.(string) if !ok { - return false, fmt.Errorf("validJSONMatcher expects a string, not %q", actual) + return false, fmt.Errorf("ValidJSONMatcher expects a string, not %q", actual) } var i interface{} @@ -189,10 +189,10 @@ func (matcher *validJSONMatcher) Match(actual interface{}) (success bool, err er return true, nil } -func (matcher *validJSONMatcher) FailureMessage(actual interface{}) (message string) { +func (matcher *ValidJSONMatcher) FailureMessage(actual interface{}) (message string) { return format.Message(actual, "to be valid JSON") } -func (matcher *validJSONMatcher) NegatedFailureMessage(actual interface{}) (message string) { +func (matcher *ValidJSONMatcher) NegatedFailureMessage(actual interface{}) (message string) { return format.Message(actual, "to _not_ be valid JSON") } |