Skip to content
Snippets Groups Projects
Commit 0f4952c3 authored by Semyon Krestyaninov's avatar Semyon Krestyaninov
Browse files

Revert "refactor tests and fix events"

This reverts commit ac5b5d39.
parent 707c4f4d
No related branches found
No related tags found
No related merge requests found
......@@ -53,12 +53,16 @@ func TestBufferedWriteSyncer_Write_Concurrent(t *testing.T) {
wg.Add(1)
go func(wg *sync.WaitGroup) {
defer wg.Done()
require.NoError(t, ws.Write(&log.Entry{Message: "log message"}))
err := ws.Write(&log.Entry{Message: "log message"})
require.NoError(t, err)
}(&wg)
}
wg.Wait()
require.NoError(t, ws.Stop())
err := ws.Stop()
require.NoError(t, err)
service.AssertExpectations(t)
}
......@@ -77,12 +81,15 @@ func TestBufferedWriteSyncer_Flush(t *testing.T) {
for i := 0; i < 10; i++ {
for j := 0; j < 10; j++ {
require.NoError(t, ws.Write(&log.Entry{Message: "log message"}))
err := ws.Write(&log.Entry{Message: "log message"})
require.NoError(t, err)
}
require.NoError(t, ws.Sync())
err := ws.Sync()
require.NoError(t, err)
}
require.NoError(t, ws.Stop())
err := ws.Stop()
require.NoError(t, err)
service.AssertExpectations(t)
}
......@@ -100,10 +107,12 @@ func TestBufferedWriteSyncer_MaxBufferSize(t *testing.T) {
ws := &BufferedWriteSyncer{Service: service, MaxBufferSize: 10}
for i := 0; i < 100; i++ {
require.NoError(t, ws.Write(&log.Entry{Message: "log message"}))
err := ws.Write(&log.Entry{Message: "log message"})
require.NoError(t, err)
}
require.NoError(t, ws.Stop())
err := ws.Stop()
require.NoError(t, err)
service.AssertExpectations(t)
}
......@@ -121,11 +130,14 @@ func TestBufferedWriteSyncer_FlushInterval(t *testing.T) {
ws := &BufferedWriteSyncer{Service: service, FlushInterval: time.Second}
for j := 0; j < 10; j++ {
require.NoError(t, ws.Write(&log.Entry{Message: "log message"}))
err := ws.Write(&log.Entry{Message: "log message"})
require.NoError(t, err)
}
time.Sleep(3 * time.Second) // ждем, пока сработает интервал
require.NoError(t, ws.Stop())
err := ws.Stop()
require.NoError(t, err)
service.AssertExpectations(t)
}
......@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/log"
logzap "git.perx.ru/perxis/perxis-go/zap"
zap2 "git.perx.ru/perxis/perxis-go/zap"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
......@@ -31,13 +31,13 @@ func TestCore_getEntry(t *testing.T) {
entry: zapcore.Entry{Level: zapcore.InfoLevel, Message: "создан элемент коллекции"},
fields: []zapcore.Field{
zap.String("key", "val"), // будет проигнорировано
logzap.Category("create"),
logzap.Component("Items.Service"),
logzap.Event("Items.Create"),
logzap.Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"),
logzap.Caller("/users/PHVz"),
logzap.Attr("any"),
logzap.Tags("tag1", "tag2", "tag3"),
zap2.Category("create"),
zap2.Component("Items.Service"),
zap2.Event("Items.Create"),
zap2.Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"),
zap2.Caller("/users/PHVz"),
zap2.Attr("any"),
zap2.Tags("tag1", "tag2", "tag3"),
},
},
want: &log.Entry{
......
......@@ -13,7 +13,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/users"
usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
logzap "git.perx.ru/perxis/perxis-go/zap"
zap2 "git.perx.ru/perxis/perxis-go/zap"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
......@@ -29,7 +29,7 @@ func TestExample(t *testing.T) {
LogLevel: log.Level(zapcore.InfoLevel),
Message: "Successfully created",
Component: "Items",
Event: items.EventItemCreate,
Event: items.EventCreateItem,
ObjectID: id.MustObjectId(item),
CallerID: id.MustObjectId(user),
Tags: []string{"tag1", "tag2", "tag3"},
......@@ -38,7 +38,7 @@ func TestExample(t *testing.T) {
LogLevel: log.Level(zapcore.WarnLevel),
Message: "Successfully updated",
Component: "Items",
Event: items.EventItemUpdate,
Event: items.EventUpdateItem,
ObjectID: id.MustObjectId(item),
CallerID: id.MustObjectId(user),
Attr: map[string]map[string]any{"title": {"old": "old title", "new": "new title"}},
......@@ -70,23 +70,23 @@ func TestExample(t *testing.T) {
// Пример отправки логов для сервиса Items
{
logger := logger.With(logzap.Component("Items"))
logger := logger.With(zap2.Component("Items"))
ctx := auth.WithPrincipal(context.Background(), factory.User("74d90aaf"))
// Отправка лога при создании item
logger.Info("Successfully created",
logzap.Event(items.EventItemCreate),
logzap.Object(item),
logzap.CallerFromContext(ctx),
logzap.Tags("tag1", "tag2", "tag3"),
zap2.Event(items.EventCreateItem),
zap2.Object(item),
zap2.CallerFromContext(ctx),
zap2.Tags("tag1", "tag2", "tag3"),
)
// Отправка лога при обновлении item
logger.Warn("Successfully updated",
logzap.Event(items.EventItemUpdate),
logzap.Object(item),
logzap.CallerFromContext(ctx),
logzap.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}),
zap2.Event(items.EventUpdateItem),
zap2.Object(item),
zap2.CallerFromContext(ctx),
zap2.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}),
)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment