diff --git a/pkg/log/zap/zap_test.go b/pkg/log/zap/zap_test.go index 4b24f980cc71671f094387f9bd2c6adedc4c167a..9bb2a97df6e95f6f25503f277cfaa8a6d3a64959 100644 --- a/pkg/log/zap/zap_test.go +++ b/pkg/log/zap/zap_test.go @@ -16,32 +16,28 @@ func TestExample(t *testing.T) { service.On("Log", mock.Anything, mock.Anything). Return(nil).Once() - func() { - ws := NewBufferedWriteSyncer(service) - defer func() { - err := ws.Stop() - assert.NoError(t, err) - }() + ws := NewBufferedWriteSyncer(service) + logger := WithLogService(zap.NewNop(), ws) - logger := WithLogService(zap.NewNop(), ws) + logger.Info("создан элемент коллекции", + Category("create"), + Component("Items.Service"), + Event("Items.Create"), + Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), + CallerFromContext(ContextWithCaller(context.Background(), "/users/PHVz")), + Attr("any"), + Tags("tag1", "tag2", "tag3"), + ) + logger.Warn("изменен элемент коллекции", + Category("update"), + Component("Items.Service"), + Event("Items.Update"), + Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl/revs/cmV2cw"), + CallerFromContext(ContextWithCaller(context.Background(), "/users/PHVz")), + ) - logger.Info("создан элемент коллекции", - Category("create"), - Component("Items.Service"), - Event("Items.Create"), - Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"), - CallerFromContext(ContextWithCaller(context.Background(), "/users/PHVz")), - Attr("any"), - Tags("tag1", "tag2", "tag3"), - ) - logger.Warn("изменен элемент коллекции", - Category("update"), - Component("Items.Service"), - Event("Items.Update"), - Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl/revs/cmV2cw"), - CallerFromContext(ContextWithCaller(context.Background(), "/users/PHVz")), - ) - }() + err := ws.Stop() + assert.NoError(t, err) service.AssertCalled(t, "Log", mock.Anything, mock.MatchedBy(func(entries []*log.Entry) bool { return len(entries) == 2