benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few more fixes in tests

Browse Source
This commit is contained in:
mcrakhman 2022-12-19 18:51:31 +01:00
parent 15ccf29f0b
commit f1d1a26b64
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/commonspace/diffservice/diffsyncer_test.go
View File

@ -8,6 +8,7 @@ import (
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument/deletionstate/mock_deletionstate"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto/mock_spacesyncproto"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/statusservice"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage/mock_storage"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter/mock_treegetter"
"github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/peer"
@ -110,7 +111,7 @@ func TestDiffSyncer_Sync(t *testing.T) {
spaceId := "spaceId"
aclRootId := "aclRootId"
l := logger.NewNamed(spaceId)
diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, nil, l)
diffSyncer := newDiffSyncer(spaceId, diffMock, connectorMock, cacheMock, stMock, factory, statusservice.NewNoOpStatusService(), l)
delState.EXPECT().AddObserver(gomock.Any())
diffSyncer.Init(delState)

13
common/commonspace/synctree/synctree.go
View File

@ -100,10 +100,10 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (id string, err error)
deps.SyncService,
deps.Configuration)
headUpdate := syncClient.CreateHeadUpdate(objTree, nil)
deps.StatusService.HeadsChange(objTree.ID(), objTree.Heads())
syncClient.BroadcastAsync(headUpdate)
id = objTree.ID()
headUpdate := syncClient.CreateHeadUpdate(objTree, nil)
deps.StatusService.HeadsChange(id, objTree.Heads())
syncClient.BroadcastAsync(headUpdate)
return
}
@ -118,11 +118,10 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (id string, err error)
deps.SyncService,
deps.Configuration)
headUpdate := syncClient.CreateHeadUpdate(objTree, nil)
deps.StatusService.HeadsChange(objTree.ID(), objTree.Heads())
syncClient.BroadcastAsync(headUpdate)
id = objTree.ID()
headUpdate := syncClient.CreateHeadUpdate(objTree, nil)
deps.StatusService.HeadsChange(id, objTree.Heads())
syncClient.BroadcastAsync(headUpdate)
return
}

3
common/commonspace/synctree/synctree_test.go
View File

@ -62,6 +62,7 @@ func Test_DeriveSyncTree(t *testing.T) {
}
createSyncClient = syncClientFuncCreator(syncClientMock)
headUpdate := &treechangeproto.TreeSyncMessage{}
objTreeMock.EXPECT().Heads().AnyTimes().Return([]string{"h1"})
syncClientMock.EXPECT().CreateHeadUpdate(gomock.Any(), gomock.Nil()).Return(headUpdate)
syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil)
deps := CreateDeps{
@ -95,6 +96,7 @@ func Test_CreateSyncTree(t *testing.T) {
}
createSyncClient = syncClientFuncCreator(syncClientMock)
objTreeMock.EXPECT().Heads().AnyTimes().Return([]string{"h1"})
headUpdate := &treechangeproto.TreeSyncMessage{}
syncClientMock.EXPECT().CreateHeadUpdate(gomock.Any(), gomock.Nil()).Return(headUpdate)
syncClientMock.EXPECT().BroadcastAsync(gomock.Eq(headUpdate)).Return(nil)
@ -199,6 +201,7 @@ func Test_BuildSyncTree(t *testing.T) {
Mode: tree.Append,
Added: changes,
}
objTreeMock.EXPECT().ID().Return("id").AnyTimes()
objTreeMock.EXPECT().AddContent(gomock.Any(), gomock.Eq(content)).
Return(expectedRes, nil)