refactor
This commit is contained in:
parent
cf135ed129
commit
da8e7f3133
112
logger_test.go
112
logger_test.go
|
@ -16,28 +16,104 @@ import (
|
||||||
func TestLogger(t *testing.T) {
|
func TestLogger(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
logger, obs := newLogger()
|
t.Run("OK: status code=200", func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
router := chi.NewRouter()
|
logger, obs := newLogger()
|
||||||
router.Use(chizap.Logger(logger))
|
|
||||||
router.Get("/info", func(w http.ResponseWriter, r *http.Request) {
|
router := chi.NewRouter()
|
||||||
w.WriteHeader(http.StatusOK)
|
router.Use(chizap.Logger(logger))
|
||||||
})
|
router.Get("/info", func(w http.ResponseWriter, r *http.Request) {
|
||||||
router.Get("/warn", func(w http.ResponseWriter, r *http.Request) {
|
w.WriteHeader(http.StatusOK)
|
||||||
w.WriteHeader(http.StatusBadRequest)
|
})
|
||||||
})
|
|
||||||
router.Get("/error", func(w http.ResponseWriter, r *http.Request) {
|
req, err := http.NewRequest("GET", "/info?test=true", nil)
|
||||||
w.WriteHeader(http.StatusInternalServerError)
|
assert.NoError(t, err)
|
||||||
|
router.ServeHTTP(httptest.NewRecorder(), req)
|
||||||
|
|
||||||
|
entries := obs.TakeAll()
|
||||||
|
require.Len(t, entries, 1)
|
||||||
|
assert.Equal(t, "/info", entries[0].Message)
|
||||||
|
assert.Equal(t, zap.InfoLevel, entries[0].Level)
|
||||||
})
|
})
|
||||||
|
|
||||||
res1 := httptest.NewRecorder()
|
t.Run("OK: status code=400", func(t *testing.T) {
|
||||||
req1, err := http.NewRequest("GET", "/info?test=true", nil)
|
t.Parallel()
|
||||||
assert.NoError(t, err)
|
|
||||||
router.ServeHTTP(res1, req1)
|
|
||||||
|
|
||||||
entries1 := obs.TakeAll()
|
logger, obs := newLogger()
|
||||||
require.Len(t, entries1, 1)
|
|
||||||
assert.Equal(t, "/info", entries1[0].Message)
|
router := chi.NewRouter()
|
||||||
|
router.Use(chizap.Logger(logger))
|
||||||
|
router.Get("/warn", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
})
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", "/warn", nil)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
router.ServeHTTP(httptest.NewRecorder(), req)
|
||||||
|
|
||||||
|
entries := obs.TakeAll()
|
||||||
|
require.Len(t, entries, 1)
|
||||||
|
assert.Equal(t, "/warn", entries[0].Message)
|
||||||
|
assert.Equal(t, zap.WarnLevel, entries[0].Level)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("OK: status code=500", func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
logger, obs := newLogger()
|
||||||
|
|
||||||
|
router := chi.NewRouter()
|
||||||
|
router.Use(chizap.Logger(logger))
|
||||||
|
router.Get("/error", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
})
|
||||||
|
|
||||||
|
req, err := http.NewRequest("GET", "/error", nil)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
router.ServeHTTP(httptest.NewRecorder(), req)
|
||||||
|
|
||||||
|
entries := obs.TakeAll()
|
||||||
|
require.Len(t, entries, 1)
|
||||||
|
assert.Equal(t, "/error", entries[0].Message)
|
||||||
|
assert.Equal(t, zap.ErrorLevel, entries[0].Level)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("OK: path should be skipped", func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
logger, obs := newLogger()
|
||||||
|
|
||||||
|
router := chi.NewRouter()
|
||||||
|
router.Use(chizap.Logger(
|
||||||
|
logger,
|
||||||
|
chizap.WithFilter(func(r *http.Request) bool {
|
||||||
|
return r.URL.Path != "/anythingelse"
|
||||||
|
}),
|
||||||
|
chizap.WithFilter(func(r *http.Request) bool {
|
||||||
|
return r.URL.Path != "/error"
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
router.Get("/error", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
})
|
||||||
|
router.Get("/success", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
|
req1, err := http.NewRequest("GET", "/error", nil)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
router.ServeHTTP(httptest.NewRecorder(), req1)
|
||||||
|
|
||||||
|
req2, err := http.NewRequest("GET", "/success", nil)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
router.ServeHTTP(httptest.NewRecorder(), req2)
|
||||||
|
|
||||||
|
entries := obs.TakeAll()
|
||||||
|
require.Len(t, entries, 1)
|
||||||
|
assert.Equal(t, "/success", entries[0].Message)
|
||||||
|
assert.Equal(t, zap.InfoLevel, entries[0].Level)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func newLogger() (*zap.Logger, *observer.ObservedLogs) {
|
func newLogger() (*zap.Logger, *observer.ObservedLogs) {
|
||||||
|
|
Loading…
Reference in New Issue