From 657f8c26605ca8a61806c86e10984e8331f92bbf Mon Sep 17 00:00:00 2001 From: ensiouel <ensiouel@gmail.com> Date: Tue, 6 Feb 2024 12:38:07 +0300 Subject: [PATCH] fix test --- pkg/log/zap/zap_test.go | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/pkg/log/zap/zap_test.go b/pkg/log/zap/zap_test.go index 9bb2a97d..6cdbcd68 100644 --- a/pkg/log/zap/zap_test.go +++ b/pkg/log/zap/zap_test.go @@ -2,6 +2,8 @@ package zap import ( "context" + "reflect" + "slices" "testing" "git.perx.ru/perxis/perxis-go/pkg/log" @@ -9,6 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" + "go.uber.org/zap/zapcore" ) func TestExample(t *testing.T) { @@ -39,7 +42,34 @@ func TestExample(t *testing.T) { err := ws.Stop() assert.NoError(t, err) + wantEntries := []*log.Entry{ + { + LogLevel: log.Level(zapcore.InfoLevel), + Message: "создан элемент коллекции", + Category: "create", + Component: "Items.Service", + Event: "Items.Create", + Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl", + Caller: "/users/PHVz", + Attr: "any", + Tags: []string{"tag1", "tag2", "tag3"}, + }, + { + LogLevel: log.Level(zapcore.WarnLevel), + Message: "изменен элемент коллекции", + Category: "update", + Component: "Items.Service", + Event: "Items.Update", + Object: "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl/revs/cmV2cw", + Caller: "/users/PHVz", + }, + } + service.AssertCalled(t, "Log", mock.Anything, mock.MatchedBy(func(entries []*log.Entry) bool { - return len(entries) == 2 + return len(entries) == 2 && slices.EqualFunc(entries, wantEntries, func(entryA, entryB *log.Entry) bool { + entryA.ID = entryB.ID // игнорируем ID + entryA.Timestamp = entryB.Timestamp // игнорируем Timestamp + return reflect.DeepEqual(entryA, entryB) + }) })) } -- GitLab