upstream/webhookd
1
0
Fork 0
mirror of https://github.com/ncarlier/webhookd.git synced 2025-04-06 18:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(): improve test lib and fix typos

Browse Source
This commit is contained in:
Nicolas Carlier 2024-01-04 07:29:12 +00:00
parent 073ac38b47
commit 0f6aa981d2
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/test/helper_test.go
View File

@ -15,8 +15,8 @@ func TestQueryParamsToShellVars(t *testing.T) {
"list": []string{"foo", "bar"},
}
values := api.HTTPParamsToShellVars(tc)
assert.ContainsStr(t, "string=foo", values, "")
assert.ContainsStr(t, "list=foo,bar", values, "")
assert.Contains(t, "string=foo", values, "")
assert.Contains(t, "list=foo,bar", values, "")
}
func TestHTTPHeadersToShellVars(t *testing.T) {
@ -25,6 +25,6 @@ func TestHTTPHeadersToShellVars(t *testing.T) {
"X-Foo-Bar": []string{"foo", "bar"},
}
values := api.HTTPParamsToShellVars(tc)
assert.ContainsStr(t, "content_type=text/plain", values, "")
assert.ContainsStr(t, "x_foo_bar=foo,bar", values, "")
assert.Contains(t, "content_type=text/plain", values, "")
assert.Contains(t, "x_foo_bar=foo,bar", values, "")
}

12
pkg/assert/assert.go
View File

@ -25,27 +25,27 @@ func NotNil(t *testing.T, actual interface{}, message string) {
}
// Equal assert that an object is equal to an expected value
func Equal(t *testing.T, expected, actual interface{}, message string) {
func Equal[K comparable](t *testing.T, expected, actual K, message string) {
if message == "" {
message = "Equal assertion failed"
}
if actual != expected {
t.Fatalf("%s - expected: %s, actual: %s", message, expected, actual)
t.Fatalf("%s - expected: %v, actual: %v", message, expected, actual)
}
}
// NotEqual assert that an object is not equal to an expected value
func NotEqual(t *testing.T, expected, actual interface{}, message string) {
func NotEqual[K comparable](t *testing.T, expected, actual K, message string) {
if message == "" {
message = "Not equal assertion failed"
}
if actual == expected {
t.Fatalf("%s - unexpected: %s, actual: %s", message, expected, actual)
t.Fatalf("%s - unexpected: %v, actual: %v", message, expected, actual)
}
}
// ContainsStr assert that an array contains an expected value
func ContainsStr(t *testing.T, expected string, array []string, message string) {
func Contains[K comparable](t *testing.T, expected K, array []K, message string) {
if message == "" {
message = "Array don't contains expected value"
}
@ -54,7 +54,7 @@ func ContainsStr(t *testing.T, expected string, array []string, message string)
return
}
}
t.Fatalf("%s - array: %v, expected value: %s", message, array, expected)
t.Fatalf("%s - array: %v, expected value: %v", message, array, expected)
}
// True assert that an expression is true

4
pkg/hook/job.go
View File

@ -94,7 +94,7 @@ func (job *Job) Terminate(err error) error {
"id", job.ID(),
"status", "error",
"err", err,
"took", time.Since(job.start).Microseconds(),
"took", time.Since(job.start).Milliseconds(),
)
return err
}
@ -103,7 +103,7 @@ func (job *Job) Terminate(err error) error {
"hook", job.Name(),
"id", job.ID(),
"status", "success",
"took", time.Since(job.start).Microseconds(),
"took", time.Since(job.start).Milliseconds(),
)
return nil
}

2
pkg/notification/http/http_notifier.go
View File

@ -27,7 +27,7 @@ type httpNotifier struct {
}
func newHTTPNotifier(uri *url.URL) (notification.Notifier, error) {
slog.Info("using HTTP notification system ", "üri", uri.Opaque)
slog.Info("using HTTP notification system ", "uri", uri.Opaque)
return &httpNotifier{
URL: uri,
PrefixFilter: helper.GetValueOrAlt(uri.Query(), "prefix", "notify:"),