mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Improve error log test readability

Browse source
This commit is contained in:
Herman Slatman 2022-11-17 13:07:19 +01:00
parent 362be72120
commit 27bbc3682b
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
api/log/log_test.go
View file

@ -4,7 +4,6 @@ import (
"errors" "errors"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"reflect"
"testing" "testing"
"unsafe" "unsafe"
@ -26,10 +25,10 @@ func TestError(t *testing.T) {
name string name string
args args args args
withFields bool withFields bool
want error want string
}{ }{
{"normalLogger", args{httptest.NewRecorder(), theError}, false, theError}, {"normalLogger", args{httptest.NewRecorder(), theError}, false, "the error"},
{"responseLogger", args{logging.NewResponseLogger(httptest.NewRecorder()), theError}, true, theError}, {"responseLogger", args{logging.NewResponseLogger(httptest.NewRecorder()), theError}, true, "the error"},
} }
for _, tt := range tests { for _, tt := range tests {
@ -38,8 +37,8 @@ func TestError(t *testing.T) {
if tt.withFields { if tt.withFields {
if rl, ok := tt.args.rw.(logging.ResponseLogger); ok { if rl, ok := tt.args.rw.(logging.ResponseLogger); ok {
fields := rl.Fields() fields := rl.Fields()
if !reflect.DeepEqual(fields["error"], tt.want) { if fields["error"].(error).Error() != tt.want {
t.Errorf("ResponseLogger[\"error\"] = %s, wants %s", fields["error"], tt.want) t.Errorf(`ResponseLogger["error"] = %s, wants %s`, fields["error"], tt.want)
} }
} else { } else {
t.Error("ResponseWriter does not implement logging.ResponseLogger") t.Error("ResponseWriter does not implement logging.ResponseLogger")
@ -76,9 +75,9 @@ func TestError_StackTracedError(t *testing.T) {
name string name string
args args args args
withFields bool withFields bool
want error want string
}{ }{
{"responseLoggerWithStackTracedError", args{logging.NewResponseLogger(httptest.NewRecorder()), &aStackTracedError}, true, &aStackTracedError}, {"responseLoggerWithStackTracedError", args{logging.NewResponseLogger(httptest.NewRecorder()), &aStackTracedError}, true, "a stacktraced error"},
} }
for _, tt := range tests { for _, tt := range tests {
@ -87,12 +86,12 @@ func TestError_StackTracedError(t *testing.T) {
if tt.withFields { if tt.withFields {
if rl, ok := tt.args.rw.(logging.ResponseLogger); ok { if rl, ok := tt.args.rw.(logging.ResponseLogger); ok {
fields := rl.Fields() fields := rl.Fields()
if !reflect.DeepEqual(fields["error"], tt.want) { if fields["error"].(error).Error() != tt.want {
t.Errorf("ResponseLogger[\"error\"] = %s, wants %s", fields["error"], tt.want) t.Errorf(`ResponseLogger["error"] = %s, wants %s`, fields["error"], tt.want)
} }
// `stack-trace` expected to be set; not interested in actual output // `stack-trace` expected to be set; not interested in actual output
if _, ok := fields["stack-trace"]; !ok { if _, ok := fields["stack-trace"]; !ok {
t.Errorf("ResponseLogger[\"stack-trace\"] not set") t.Errorf(`ResponseLogger["stack-trace"] not set`)
} }
} else { } else {
t.Error("ResponseWriter does not implement logging.ResponseLogger") t.Error("ResponseWriter does not implement logging.ResponseLogger")