anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00
Code Activity

Fix deleter tests

Browse source
This commit is contained in:
mcrakhman 2025-02-05 15:33:24 +01:00
parent 541f96f0cb
commit d2c85ae7e1
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
commonspace/deletionmanager/deleter_test.go
View file

@ -26,11 +26,11 @@ func TestDeleter_Delete(t *testing.T) {
spaceId := "spaceId"
delState.EXPECT().GetQueued().Return([]string{id})
st.EXPECT().Id().Return(spaceId)
st.EXPECT().TreeStorage(id).Return(nil, treestorage.ErrUnknownTreeId)
st.EXPECT().TreeStorage(gomock.Any(), id).Return(nil, treestorage.ErrUnknownTreeId)
treeManager.EXPECT().MarkTreeDeleted(gomock.Any(), spaceId, id).Return(nil)
delState.EXPECT().Delete(id).Return(nil)
deleter.Delete(context.TODO())
deleter.Delete(context.Background())
})
t.Run("deleter delete mark deleted other error", func(t *testing.T) {
@ -38,9 +38,9 @@ func TestDeleter_Delete(t *testing.T) {
spaceId := "spaceId"
delState.EXPECT().GetQueued().Return([]string{id})
st.EXPECT().Id().Return(spaceId)
st.EXPECT().TreeStorage(id).Return(nil, fmt.Errorf("unknown error"))
st.EXPECT().TreeStorage(gomock.Any(), id).Return(nil, fmt.Errorf("unknown error"))
deleter.Delete(context.TODO())
deleter.Delete(context.Background())
})
t.Run("deleter delete mark deleted fail", func(t *testing.T) {
@ -48,10 +48,10 @@ func TestDeleter_Delete(t *testing.T) {
spaceId := "spaceId"
delState.EXPECT().GetQueued().Return([]string{id})
st.EXPECT().Id().Return(spaceId)
st.EXPECT().TreeStorage(id).Return(nil, treestorage.ErrUnknownTreeId)
st.EXPECT().TreeStorage(gomock.Any(), id).Return(nil, treestorage.ErrUnknownTreeId)
treeManager.EXPECT().MarkTreeDeleted(gomock.Any(), spaceId, id).Return(fmt.Errorf("mark error"))
deleter.Delete(context.TODO())
deleter.Delete(context.Background())
})
t.Run("deleter delete success", func(t *testing.T) {
@ -59,11 +59,11 @@ func TestDeleter_Delete(t *testing.T) {
spaceId := "spaceId"
delState.EXPECT().GetQueued().Return([]string{id})
st.EXPECT().Id().Return(spaceId)
st.EXPECT().TreeStorage(id).Return(nil, nil)
st.EXPECT().TreeStorage(gomock.Any(), id).Return(nil, nil)
treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(nil)
delState.EXPECT().Delete(id).Return(nil)
deleter.Delete(context.TODO())
deleter.Delete(context.Background())
})
t.Run("deleter delete error", func(t *testing.T) {
@ -71,9 +71,9 @@ func TestDeleter_Delete(t *testing.T) {
spaceId := "spaceId"
delState.EXPECT().GetQueued().Return([]string{id})
st.EXPECT().Id().Return(spaceId)
st.EXPECT().TreeStorage(id).Return(nil, nil)
st.EXPECT().TreeStorage(gomock.Any(), id).Return(nil, nil)
treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(fmt.Errorf("some error"))
deleter.Delete(context.TODO())
deleter.Delete(context.Background())
})
}

9
commonspace/deletionmanager/deletionmanager_test.go
View file

@ -2,6 +2,11 @@ package deletionmanager
import (
"context"
"testing"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"github.com/anyproto/any-sync/app"
"github.com/anyproto/any-sync/commonspace/deletionmanager/mock_deletionmanager"
"github.com/anyproto/any-sync/commonspace/deletionstate"
@ -12,9 +17,6 @@ import (
"github.com/anyproto/any-sync/commonspace/spacestate"
"github.com/anyproto/any-sync/commonspace/spacestorage"
"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"testing"
)
type deletionManagerFixture struct {
@ -54,7 +56,6 @@ func (fx *deletionManagerFixture) init(t *testing.T) {
fx.delState.EXPECT().Name().AnyTimes().Return(deletionstate.CName)
fx.treeManager.EXPECT().Name().AnyTimes().Return(treemanager.CName)
fx.storage.EXPECT().Name().AnyTimes().Return(spacestorage.CName)
fx.storage.EXPECT().SpaceSettingsId().AnyTimes().Return(fx.settingsId)
fx.delState.EXPECT().AddObserver(gomock.Any())
fx.app.Register(fx.spaceState).
Register(fx.storage).